Bug 419409. MSAA/IAccessible2 broken in gmail. This fixes the crash part of the problem. r=marcoz, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@246568 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronleventhal%moonset.net 2008-02-26 22:36:29 +00:00
parent a240c30fef
commit d004facbc8
2 changed files with 6 additions and 1 deletions

View File

@ -225,8 +225,10 @@ NS_IMETHODIMP nsAccessNode::GetUniqueID(void **aUniqueID)
NS_IMETHODIMP nsAccessNode::GetOwnerWindow(void **aWindow)
{
*aWindow = nsnull;
nsCOMPtr<nsIAccessibleDocument> docAccessible(GetDocAccessible());
NS_ASSERTION(docAccessible, "No root accessible pointer back, Init() not called.");
if (!docAccessible)
return NS_ERROR_FAILURE; // This node or doc accessible is shut down
return docAccessible->GetWindowHandle(aWindow);
}

View File

@ -1394,6 +1394,9 @@ STDMETHODIMP
nsAccessibleWrap::get_windowHandle(HWND *windowHandle)
{
__try {
*windowHandle = 0;
if (!mDOMNode)
return E_FAIL;
void *handle = nsnull;
nsresult rv = GetOwnerWindow(&handle);
if (NS_FAILED(rv))