Bug 386922 - rename nsAccessibilityUtils, r=aaronlev (ea9fc76a) · Commits · Tommy Webb / Tor Browser

accessible/src/base/nsAccessibilityService.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ nsAccessibilityService::CreateHyperTextAccessible(nsISupports *aFrame, nsIAccess
		nsCOMPtr<nsIContent> content(do_QueryInterface(node));
		NS_ENSURE_TRUE(content, NS_ERROR_FAILURE);

		if (nsAccessibilityUtils::HasListener(content, NS_LITERAL_STRING("click"))) {
		if (nsAccUtils::HasListener(content, NS_LITERAL_STRING("click"))) {
		// nsLinkableAccessible inherits from nsHyperTextAccessible, but
		// it also includes code for dealing with the onclick
		*aAccessible = new nsLinkableAccessible(node, weakShell);
		@@ -1383,7 +1383,7 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
		// correspond to the doc accessible and will be created in any case
		if (!newAcc && content->Tag() != nsAccessibilityAtoms::body && content->GetParent() &&
		(content->IsFocusable() \|\|
		(isHTML && nsAccessibilityUtils::HasListener(content, NS_LITERAL_STRING("click"))) \|\|
		(isHTML && nsAccUtils::HasListener(content, NS_LITERAL_STRING("click"))) \|\|
		content->HasAttr(kNameSpaceID_WAIProperties, nsAccessibilityAtoms::describedby) \|\|
		content->HasAttr(kNameSpaceID_WAIProperties, nsAccessibilityAtoms::labelledby) \|\|
		content->HasAttr(kNameSpaceID_WAIProperties, nsAccessibilityAtoms::required) \|\|

accessible/src/base/nsAccessibilityUtils.cpp

+15 −18

Original line number	Diff line number	Diff line
		@@ -42,8 +42,7 @@
		#include "nsIEventListenerManager.h"

		void
		nsAccessibilityUtils::GetAccAttr(nsIPersistentProperties *aAttributes,
		nsIAtom *aAttrName,
		nsAccUtils::GetAccAttr(nsIPersistentProperties aAttributes, nsIAtom aAttrName,
		nsAString& aAttrValue)
		{
		nsCAutoString attrName;
		@@ -52,8 +51,7 @@ nsAccessibilityUtils::GetAccAttr(nsIPersistentProperties *aAttributes,
		}

		void
		nsAccessibilityUtils::SetAccAttr(nsIPersistentProperties *aAttributes,
		nsIAtom *aAttrName,
		nsAccUtils::SetAccAttr(nsIPersistentProperties aAttributes, nsIAtom aAttrName,
		const nsAString& aAttrValue)
		{
		nsAutoString oldValue;
		@@ -64,9 +62,8 @@ nsAccessibilityUtils::SetAccAttr(nsIPersistentProperties *aAttributes,
		}

		void
		nsAccessibilityUtils::GetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		PRInt32 *aLevel,
		PRInt32 *aPosInSet,
		nsAccUtils::GetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		PRInt32 aLevel, PRInt32 aPosInSet,
		PRInt32 *aSetSize)
		{
		*aLevel = 0;
		@@ -99,7 +96,7 @@ nsAccessibilityUtils::GetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		}

		PRBool
		nsAccessibilityUtils::HasAccGroupAttrs(nsIPersistentProperties *aAttributes)
		nsAccUtils::HasAccGroupAttrs(nsIPersistentProperties *aAttributes)
		{
		nsAutoString value;

		@@ -113,9 +110,8 @@ nsAccessibilityUtils::HasAccGroupAttrs(nsIPersistentProperties *aAttributes)
		}

		void
		nsAccessibilityUtils::SetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		PRInt32 aLevel,
		PRInt32 aPosInSet,
		nsAccUtils::SetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		PRInt32 aLevel, PRInt32 aPosInSet,
		PRInt32 aSetSize)
		{
		nsAutoString value;
		@@ -137,7 +133,7 @@ nsAccessibilityUtils::SetAccGroupAttrs(nsIPersistentProperties *aAttributes,
		}

		void
		nsAccessibilityUtils::SetAccAttrsForXULSelectControlItem(nsIDOMNode *aNode,
		nsAccUtils::SetAccAttrsForXULSelectControlItem(nsIDOMNode *aNode,
		nsIPersistentProperties *aAttributes)
		{
		nsCOMPtr<nsIDOMXULSelectControlItemElement> item(do_QueryInterface(aNode));
		@@ -157,7 +153,8 @@ nsAccessibilityUtils::SetAccAttrsForXULSelectControlItem(nsIDOMNode *aNode,
		SetAccGroupAttrs(aAttributes, 0, indexOf + 1, itemsCount);
		}

		PRBool nsAccessibilityUtils::HasListener(nsIContent *aContent, const nsAString& aEventType)
		PRBool
		nsAccUtils::HasListener(nsIContent *aContent, const nsAString& aEventType)
		{
		NS_ENSURE_ARG_POINTER(aContent);
		nsCOMPtr<nsIEventListenerManager> listenerManager;

accessible/src/base/nsAccessibilityUtils.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@
		#include "nsIPersistentProperties2.h"
		#include "nsIContent.h"

		class nsAccessibilityUtils
		class nsAccUtils
		{
		public:
		/**

accessible/src/base/nsAccessible.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -2091,7 +2091,7 @@ nsAccessible::GetAttributes(nsIPersistentProperties **aAttributes)
		}
		}

		if (!nsAccessibilityUtils::HasAccGroupAttrs(attributes)) {
		if (!nsAccUtils::HasAccGroupAttrs(attributes)) {
		// The role of an accessible can be pointed by ARIA attribute but ARIA
		// posinset, level, setsize may be skipped. Therefore we calculate here
		// these properties to map them into description.
		@@ -2153,8 +2153,7 @@ nsAccessible::GetAttributes(nsIPersistentProperties **aAttributes)
		}
		}

		nsAccessibilityUtils::SetAccGroupAttrs(attributes, groupLevel,
		positionInGroup,
		nsAccUtils::SetAccGroupAttrs(attributes, groupLevel, positionInGroup,
		setSize);
		}
		}
		@@ -2208,8 +2207,7 @@ nsAccessible::GroupPosition(PRInt32 *aGroupLevel,
		return NS_ERROR_FAILURE;
		}
		PRInt32 level, posInSet, setSize;
		nsAccessibilityUtils::GetAccGroupAttrs(attributes,
		&level, &posInSet, &setSize);
		nsAccUtils::GetAccGroupAttrs(attributes, &level, &posInSet, &setSize);

		if (!posInSet && !setSize)
		return NS_OK;

accessible/src/base/nsBaseWidgetAccessible.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ void nsLinkableAccessible::CacheActionContent()
		}
		}
		}
		if (nsAccessibilityUtils::HasListener(walkUpContent, NS_LITERAL_STRING("click"))) {
		if (nsAccUtils::HasListener(walkUpContent, NS_LITERAL_STRING("click"))) {
		mActionContent = walkUpContent;
		mIsOnclick = PR_TRUE;
		break;