Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 391562. Pass aExtraState as nsnull to GetFinalState() if not needed. r=surkov, a=dsicore

Browse Source
This commit is contained in:
aaronleventhal@moonset.net 2007-08-29 06:41:38 -07:00
parent 77dadd7d29
commit 31f525c91f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/src/atk/nsAccessibleWrap.cpp
View File

@ -792,7 +792,7 @@ GetAttributeSet(nsIAccessible* aAccessible)
if (attributes) {
// Deal with attributes that we only need to expose in ATK
PRUint32 state, extraState;
aAccessible->GetFinalState(&state, &extraState);
aAccessible->GetFinalState(&state, nsnull);
if (state & nsIAccessibleStates::STATE_HASPOPUP) {
// There is no ATK state for haspopup, must use object attribute to expose the same info
nsAutoString oldValueUnused;

2
accessible/src/base/nsAccessibleEventData.cpp
View File

@ -359,7 +359,7 @@ nsAccStateChangeEvent::
nsCOMPtr<nsIAccessible> accessible(GetAccessibleByNode());
if (accessible) {
PRUint32 state = 0, extraState = 0;
accessible->GetFinalState(&state, &extraState);
accessible->GetFinalState(&state, mIsExtraState ? &extraState : nsnull);
mIsEnabled = ((mIsExtraState ? extraState : state) & mState) != 0;
} else {
mIsEnabled = PR_FALSE;

4
accessible/src/msaa/CAccessibleComponent.cpp
View File

@ -88,8 +88,8 @@ CAccessibleComponent::get_locationInParent(long *aX, long *aY)
return E_FAIL;
// If the object is not on any screen the returned position is (0,0).
PRUint32 states = 0, extraStates = 0;
nsresult rv = acc->GetFinalState(&states, &extraStates);
PRUint32 states = 0;
nsresult rv = acc->GetFinalState(&states, nsnull);
if (NS_FAILED(rv))
return E_FAIL;

4
accessible/src/msaa/nsAccessibleWrap.cpp
View File

@ -498,8 +498,8 @@ STDMETHODIMP nsAccessibleWrap::get_accState(
if (!xpAccessible)
return E_FAIL;
PRUint32 state = 0, extraState;
if (NS_FAILED(xpAccessible->GetFinalState(&state, &extraState)))
PRUint32 state = 0;
if (NS_FAILED(xpAccessible->GetFinalState(&state, nsnull)))
return E_FAIL;
pvarState->lVal = state;