wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 617300 - remove unnecessary checks from nsDocAccessible::AttributeChanged processing, r=davidb, a=blockingBetaN

Browse Source
This commit is contained in:
Alexander Surkov 2011-01-18 12:15:05 +08:00
parent 0231a8f065
commit 4806ecbddd
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
accessible/src/base/nsDocAccessible.cpp
View File

@ -966,6 +966,9 @@ nsDocAccessible::AttributeChanged(nsIDocument *aDocument,
PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRInt32 aNameSpaceID, nsIAtom* aAttribute,
PRInt32 aModType) PRInt32 aModType)
{ {
NS_ASSERTION(!IsDefunct(),
"Attribute changed called on defunct document accessible!");
// Proceed even if the element is not accessible because element may become // Proceed even if the element is not accessible because element may become
// accessible if it gets certain attribute. // accessible if it gets certain attribute.
if (UpdateAccessibleOnAttrChange(aElement, aAttribute)) if (UpdateAccessibleOnAttrChange(aElement, aAttribute))
@ -974,6 +977,8 @@ nsDocAccessible::AttributeChanged(nsIDocument *aDocument,
// Ignore attribute change if the element doesn't have an accessible (at all // Ignore attribute change if the element doesn't have an accessible (at all
// or still) iff the element is not a root content of this document accessible // or still) iff the element is not a root content of this document accessible
// (which is treated as attribute change on this document accessible). // (which is treated as attribute change on this document accessible).
// Note: we don't bail if all the content hasn't finished loading because
// these attributes are changing for a loaded part of the content.
nsAccessible* accessible = GetCachedAccessible(aElement); nsAccessible* accessible = GetCachedAccessible(aElement);
if (!accessible && (mContent != aElement)) if (!accessible && (mContent != aElement))
return; return;
@ -1017,22 +1022,6 @@ nsDocAccessible::AttributeChangedImpl(nsIContent* aContent, PRInt32 aNameSpaceID
// XXX todo: invalidate accessible when aria state changes affect exposed role // XXX todo: invalidate accessible when aria state changes affect exposed role
// filed as bug 472143 // filed as bug 472143
nsCOMPtr<nsISupports> container = mDocument->GetContainer();
nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
if (!docShell) {
return;
}
if (!IsContentLoaded())
return; // Still loading, ignore setting of initial attributes
nsCOMPtr<nsIPresShell> shell = GetPresShell();
if (!shell) {
return; // Document has been shut down
}
NS_ASSERTION(aContent, "No node for attr modified");
// Universal boolean properties that don't require a role. Fire the state // Universal boolean properties that don't require a role. Fire the state
// change when disabled or aria-disabled attribute is set. // change when disabled or aria-disabled attribute is set.
if (aAttribute == nsAccessibilityAtoms::disabled || if (aAttribute == nsAccessibilityAtoms::disabled ||