From cd9f1a140a44fa1e4db3028c239c37120946b343 Mon Sep 17 00:00:00 2001 From: "aaronleventhal%moonset.net" Date: Wed, 21 Sep 2005 20:25:16 +0000 Subject: [PATCH] Bug 307548. Same page links inside of a frame not firing jump event. r=parente, sr=jst, a=asa git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@180766 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/base/nsAccessibilityService.cpp | 7 ------- mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp index d817113fd5b..c99374b2050 100644 --- a/mozilla/accessible/src/base/nsAccessibilityService.cpp +++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp @@ -193,14 +193,7 @@ NS_IMETHODIMP nsAccessibilityService::OnStateChange(nsIWebProgress *aWebProgress nsCOMPtr docAccessible = do_QueryInterface(accessible); NS_ENSURE_TRUE(docAccessible, NS_ERROR_FAILURE); - - nsCOMPtr sameTypeRoot; - docShellTreeItem->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot)); PRBool isFinished = !(aStateFlags & STATE_START); - if (sameTypeRoot != docShellTreeItem) { - // Frame and iframe handling done via DOMContentLoaded in nsRootAccessible::HandleEvent() - return NS_OK; - } docAccessible->FireDocLoadingEvent(isFinished); diff --git a/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp index dc2af4b8e96..cf6e8e00163 100644 --- a/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp +++ b/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp @@ -450,6 +450,16 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireDocLoadingEvent(PRBool aIsFinished) nsDocAccessible::FireDocLoadingEvent(aIsFinished); + nsCOMPtr treeItem = GetDocShellTreeItemFor(mDOMNode); + if (!treeItem) { + return NS_OK; + } + nsCOMPtr sameTypeRoot; + treeItem->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot)); + if (sameTypeRoot != treeItem) { + return NS_OK; // We only fire MSAA doc loading events for root content frame + } + if (aIsFinished) { // Use short timer before firing state change event for finished doc, // because the window is made visible asynchronously by Microsoft Windows