Bug 723796 - nsAccessible::GetAllowsAnonChildAccessibles renamed to nsAccessible::CanHaveAnonChildren, r=surkov

This commit is contained in:
Joey Blacksmith 2012-02-08 16:31:25 +09:00
parent 85b2291568
commit 2e565a602a
18 changed files with 23 additions and 23 deletions

View File

@ -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));

View File

@ -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

View File

@ -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);

View File

@ -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())) {

View File

@ -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;
}

View File

@ -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();
};

View File

@ -590,7 +590,7 @@ nsXFormsSelectComboboxAccessible::NativeState()
}
bool
nsXFormsSelectComboboxAccessible::GetAllowsAnonChildAccessibles()
nsXFormsSelectComboboxAccessible::CanHaveAnonChildren()
{
return true;
}

View File

@ -297,7 +297,7 @@ public:
// nsAccessible
virtual mozilla::a11y::role NativeRole();
virtual PRUint64 NativeState();
virtual bool GetAllowsAnonChildAccessibles();
virtual bool CanHaveAnonChildren();
};

View File

@ -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,

View File

@ -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();

View File

@ -844,7 +844,7 @@ NS_IMETHODIMP nsXULTextFieldAccessible::DoAction(PRUint8 index)
}
bool
nsXULTextFieldAccessible::GetAllowsAnonChildAccessibles()
nsXULTextFieldAccessible::CanHaveAnonChildren()
{
return false;
}

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -66,7 +66,7 @@ public:
virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet,
PRInt32 *aSetSize);
virtual bool GetAllowsAnonChildAccessibles();
virtual bool CanHaveAnonChildren();
// ActionAccessible
virtual PRUint8 ActionCount();

View File

@ -190,7 +190,7 @@ nsXULSliderAccessible::SetCurrentValue(double aValue)
}
bool
nsXULSliderAccessible::GetAllowsAnonChildAccessibles()
nsXULSliderAccessible::CanHaveAnonChildren()
{
// Do not allow anonymous xul:slider be accessible.
return false;

View File

@ -65,7 +65,7 @@ public:
// nsAccessible
virtual mozilla::a11y::role NativeRole();
virtual PRUint64 NativeState();
virtual bool GetAllowsAnonChildAccessibles();
virtual bool CanHaveAnonChildren();
// ActionAccessible
virtual PRUint8 ActionCount();