зеркало из https://github.com/mozilla/pjs.git
Null out members in Shutdown() so we bail out of later API calls with an error. b=381057 r=aaronleventhal
This commit is contained in:
Родитель
053d357f4c
Коммит
25ac15d174
|
@ -225,6 +225,9 @@ NS_IMETHODIMP nsXULTreeAccessible::GetValue(nsAString& _retval)
|
||||||
|
|
||||||
NS_IMETHODIMP nsXULTreeAccessible::Shutdown()
|
NS_IMETHODIMP nsXULTreeAccessible::Shutdown()
|
||||||
{
|
{
|
||||||
|
mTree = nsnull;
|
||||||
|
mTreeView = nsnull;
|
||||||
|
|
||||||
nsXULSelectableAccessible::Shutdown();
|
nsXULSelectableAccessible::Shutdown();
|
||||||
|
|
||||||
if (mAccessNodeCache) {
|
if (mAccessNodeCache) {
|
||||||
|
@ -232,6 +235,7 @@ NS_IMETHODIMP nsXULTreeAccessible::Shutdown()
|
||||||
delete mAccessNodeCache;
|
delete mAccessNodeCache;
|
||||||
mAccessNodeCache = nsnull;
|
mAccessNodeCache = nsnull;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -600,8 +604,8 @@ nsXULTreeitemAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
|
||||||
mTreeView->IsContainerEmpty(mRow, &isContainerEmpty);
|
mTreeView->IsContainerEmpty(mRow, &isContainerEmpty);
|
||||||
if (!isContainerEmpty) {
|
if (!isContainerEmpty) {
|
||||||
mTreeView->IsContainerOpen(mRow, &isContainerOpen);
|
mTreeView->IsContainerOpen(mRow, &isContainerOpen);
|
||||||
*aState |= isContainerOpen? nsIAccessibleStates::STATE_EXPANDED:
|
*aState |= isContainerOpen? PRUint32(nsIAccessibleStates::STATE_EXPANDED):
|
||||||
nsIAccessibleStates::STATE_COLLAPSED;
|
PRUint32(nsIAccessibleStates::STATE_COLLAPSED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче