diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index fee4778348b..defe4c944f3 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -640,7 +640,7 @@ nsAccessible::GetChildren(nsIArray **aOutChildren) } bool -nsAccessible::GetAllowsAnonChildAccessibles() +nsAccessible::CanHaveAnonChildren() { return true; } @@ -3079,7 +3079,7 @@ nsAccessible::ContainerWidget() const void nsAccessible::CacheChildren() { - nsAccTreeWalker walker(mWeakShell, mContent, GetAllowsAnonChildAccessibles()); + nsAccTreeWalker walker(mWeakShell, mContent, CanHaveAnonChildren()); nsAccessible* child = nsnull; while ((child = walker.NextChild()) && AppendChild(child)); diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h index ebf119cf53a..6b1484e3cb6 100644 --- a/accessible/src/base/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -399,9 +399,9 @@ public: virtual nsresult HandleAccEvent(AccEvent* aAccEvent); /** - * Return true if there are accessible children in anonymous content + * Return true if this accessible allows accessible children from anonymous subtree. */ - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); /** * Returns text of accessible if accessible has text role otherwise empty diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index 1701390079e..49989c3fd95 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -1525,7 +1525,7 @@ nsDocAccessible::CacheChildren() // Search for accessible children starting from the document element since // some web pages tend to insert elements under it rather than document body. nsAccTreeWalker walker(mWeakShell, mDocument->GetRootElement(), - GetAllowsAnonChildAccessibles()); + CanHaveAnonChildren()); nsAccessible* child = nsnull; while ((child = walker.NextChild()) && AppendChild(child)); @@ -1881,7 +1881,7 @@ nsDocAccessible::UpdateTree(nsAccessible* aContainer, nsIContent* aChildNode, } else { nsAccTreeWalker walker(mWeakShell, aChildNode, - aContainer->GetAllowsAnonChildAccessibles(), true); + aContainer->CanHaveAnonChildren(), true); while ((child = walker.NextChild())) updateFlags |= UpdateTreeInternal(child, aIsInsert); diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp index 05ce35aba14..6b6fa9cab8e 100644 --- a/accessible/src/html/nsHTMLTableAccessible.cpp +++ b/accessible/src/html/nsHTMLTableAccessible.cpp @@ -458,7 +458,7 @@ nsHTMLTableAccessible::CacheChildren() // caption only, because nsAccessibilityService ensures we don't create // accessibles for the other captions, since only the first is actually // visible. - nsAccTreeWalker walker(mWeakShell, mContent, GetAllowsAnonChildAccessibles()); + nsAccTreeWalker walker(mWeakShell, mContent, CanHaveAnonChildren()); nsAccessible* child = nsnull; while ((child = walker.NextChild())) { diff --git a/accessible/src/xforms/nsXFormsAccessible.cpp b/accessible/src/xforms/nsXFormsAccessible.cpp index d58aa016243..39aeadc454f 100644 --- a/accessible/src/xforms/nsXFormsAccessible.cpp +++ b/accessible/src/xforms/nsXFormsAccessible.cpp @@ -215,7 +215,7 @@ nsXFormsAccessible::Description(nsString& aDescription) } bool -nsXFormsAccessible::GetAllowsAnonChildAccessibles() +nsXFormsAccessible::CanHaveAnonChildren() { return false; } @@ -238,7 +238,7 @@ nsXFormsContainerAccessible::NativeRole() } bool -nsXFormsContainerAccessible::GetAllowsAnonChildAccessibles() +nsXFormsContainerAccessible::CanHaveAnonChildren() { return true; } diff --git a/accessible/src/xforms/nsXFormsAccessible.h b/accessible/src/xforms/nsXFormsAccessible.h index e3c47aaac82..755e37c8b54 100644 --- a/accessible/src/xforms/nsXFormsAccessible.h +++ b/accessible/src/xforms/nsXFormsAccessible.h @@ -90,7 +90,7 @@ public: // Denies accessible nodes in anonymous content of xforms element by // always returning false value. - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); protected: // Returns value of first child xforms element by tagname that is bound to @@ -131,7 +131,7 @@ public: // Allows accessible nodes in anonymous content of xforms element by // always returning true value. - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); }; diff --git a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp index 30f91d31477..3a4b526d18c 100644 --- a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp +++ b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp @@ -590,7 +590,7 @@ nsXFormsSelectComboboxAccessible::NativeState() } bool -nsXFormsSelectComboboxAccessible::GetAllowsAnonChildAccessibles() +nsXFormsSelectComboboxAccessible::CanHaveAnonChildren() { return true; } diff --git a/accessible/src/xforms/nsXFormsFormControlsAccessible.h b/accessible/src/xforms/nsXFormsFormControlsAccessible.h index b9a0a311391..2881b76f08a 100644 --- a/accessible/src/xforms/nsXFormsFormControlsAccessible.h +++ b/accessible/src/xforms/nsXFormsFormControlsAccessible.h @@ -297,7 +297,7 @@ public: // nsAccessible virtual mozilla::a11y::role NativeRole(); virtual PRUint64 NativeState(); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); }; diff --git a/accessible/src/xul/nsXULComboboxAccessible.cpp b/accessible/src/xul/nsXULComboboxAccessible.cpp index 84eb9d2ac6a..f7dbc88f2a4 100644 --- a/accessible/src/xul/nsXULComboboxAccessible.cpp +++ b/accessible/src/xul/nsXULComboboxAccessible.cpp @@ -140,7 +140,7 @@ nsXULComboboxAccessible::Description(nsString& aDescription) } bool -nsXULComboboxAccessible::GetAllowsAnonChildAccessibles() +nsXULComboboxAccessible::CanHaveAnonChildren() { if (mContent->NodeInfo()->Equals(nsGkAtoms::textbox, kNameSpaceID_XUL) || mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::editable, diff --git a/accessible/src/xul/nsXULComboboxAccessible.h b/accessible/src/xul/nsXULComboboxAccessible.h index c479af11116..8961b93c3ec 100644 --- a/accessible/src/xul/nsXULComboboxAccessible.h +++ b/accessible/src/xul/nsXULComboboxAccessible.h @@ -61,7 +61,7 @@ public: virtual void Description(nsString& aDescription); virtual mozilla::a11y::role NativeRole(); virtual PRUint64 NativeState(); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); // ActionAccessible virtual PRUint8 ActionCount(); diff --git a/accessible/src/xul/nsXULFormControlAccessible.cpp b/accessible/src/xul/nsXULFormControlAccessible.cpp index c6f418192e5..625315bebd6 100644 --- a/accessible/src/xul/nsXULFormControlAccessible.cpp +++ b/accessible/src/xul/nsXULFormControlAccessible.cpp @@ -844,7 +844,7 @@ NS_IMETHODIMP nsXULTextFieldAccessible::DoAction(PRUint8 index) } bool -nsXULTextFieldAccessible::GetAllowsAnonChildAccessibles() +nsXULTextFieldAccessible::CanHaveAnonChildren() { return false; } diff --git a/accessible/src/xul/nsXULFormControlAccessible.h b/accessible/src/xul/nsXULFormControlAccessible.h index be1b534d777..24b216db197 100644 --- a/accessible/src/xul/nsXULFormControlAccessible.h +++ b/accessible/src/xul/nsXULFormControlAccessible.h @@ -267,7 +267,7 @@ public: virtual void ApplyARIAState(PRUint64* aState); virtual mozilla::a11y::role NativeRole(); virtual PRUint64 NativeState(); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); // ActionAccessible virtual PRUint8 ActionCount(); diff --git a/accessible/src/xul/nsXULListboxAccessible.cpp b/accessible/src/xul/nsXULListboxAccessible.cpp index 260711e956a..b2c6bbfb1ae 100644 --- a/accessible/src/xul/nsXULListboxAccessible.cpp +++ b/accessible/src/xul/nsXULListboxAccessible.cpp @@ -1024,7 +1024,7 @@ NS_IMETHODIMP nsXULListitemAccessible::GetActionName(PRUint8 aIndex, nsAString& } bool -nsXULListitemAccessible::GetAllowsAnonChildAccessibles() +nsXULListitemAccessible::CanHaveAnonChildren() { // That indicates we should walk anonymous children for listitems return true; diff --git a/accessible/src/xul/nsXULListboxAccessible.h b/accessible/src/xul/nsXULListboxAccessible.h index a51a872255d..8d55fae1e0e 100644 --- a/accessible/src/xul/nsXULListboxAccessible.h +++ b/accessible/src/xul/nsXULListboxAccessible.h @@ -141,7 +141,7 @@ public: virtual PRUint64 NativeState(); virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet, PRInt32 *aSetSize); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); // Widgets virtual nsAccessible* ContainerWidget() const; diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp index c50149bc8b6..5dee26566d6 100644 --- a/accessible/src/xul/nsXULMenuAccessible.cpp +++ b/accessible/src/xul/nsXULMenuAccessible.cpp @@ -320,7 +320,7 @@ nsXULMenuitemAccessible::GetPositionAndSizeInternal(PRInt32 *aPosInSet, } bool -nsXULMenuitemAccessible::GetAllowsAnonChildAccessibles() +nsXULMenuitemAccessible::CanHaveAnonChildren() { // That indicates we don't walk anonymous children for menuitems return false; diff --git a/accessible/src/xul/nsXULMenuAccessible.h b/accessible/src/xul/nsXULMenuAccessible.h index 96b3164eeb5..6e61fb5305e 100644 --- a/accessible/src/xul/nsXULMenuAccessible.h +++ b/accessible/src/xul/nsXULMenuAccessible.h @@ -66,7 +66,7 @@ public: virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet, PRInt32 *aSetSize); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); // ActionAccessible virtual PRUint8 ActionCount(); diff --git a/accessible/src/xul/nsXULSliderAccessible.cpp b/accessible/src/xul/nsXULSliderAccessible.cpp index 4141643e9c2..75e6ac53c69 100644 --- a/accessible/src/xul/nsXULSliderAccessible.cpp +++ b/accessible/src/xul/nsXULSliderAccessible.cpp @@ -190,7 +190,7 @@ nsXULSliderAccessible::SetCurrentValue(double aValue) } bool -nsXULSliderAccessible::GetAllowsAnonChildAccessibles() +nsXULSliderAccessible::CanHaveAnonChildren() { // Do not allow anonymous xul:slider be accessible. return false; diff --git a/accessible/src/xul/nsXULSliderAccessible.h b/accessible/src/xul/nsXULSliderAccessible.h index b964a68ef1c..be9b9289a83 100644 --- a/accessible/src/xul/nsXULSliderAccessible.h +++ b/accessible/src/xul/nsXULSliderAccessible.h @@ -65,7 +65,7 @@ public: // nsAccessible virtual mozilla::a11y::role NativeRole(); virtual PRUint64 NativeState(); - virtual bool GetAllowsAnonChildAccessibles(); + virtual bool CanHaveAnonChildren(); // ActionAccessible virtual PRUint8 ActionCount();