From fca33e858b6422ec975c2a1a47761c3275dcae94 Mon Sep 17 00:00:00 2001 From: "aaronleventhal%moonset.net" Date: Mon, 7 May 2007 18:59:08 +0000 Subject: [PATCH] Incorrect part of previous checkin would cause bustage --- accessible/src/msaa/nsAccessibleWrap.cpp | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp index e5b55682a0f..03735d95642 100644 --- a/accessible/src/msaa/nsAccessibleWrap.cpp +++ b/accessible/src/msaa/nsAccessibleWrap.cpp @@ -1510,19 +1510,19 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) } } -+ PRInt32 childID = GetChildIDFor(accessible); // get the id for the accessible -+ if (!childID) -+ return NS_OK; // Can't fire an event without a child ID -+ -+ // See if we're in a scrollable area with its own window -+ nsCOMPtr newAccessible; -+ if (eventType == nsIAccessibleEvent::EVENT_HIDE) { -+ // Don't use frame from current accessible when we're hiding that -+ // accessible. -+ accessible->GetParent(getter_AddRefs(newAccessible)); -+ } else { -+ newAccessible = accessible; -+ } + PRInt32 childID = GetChildIDFor(accessible); // get the id for the accessible + if (!childID) + return NS_OK; // Can't fire an event without a child ID + + // See if we're in a scrollable area with its own window + nsCOMPtr newAccessible; + if (eventType == nsIAccessibleEvent::EVENT_HIDE) { + // Don't use frame from current accessible when we're hiding that + // accessible. + accessible->GetParent(getter_AddRefs(newAccessible)); + } else { + newAccessible = accessible; + } HWND hWnd = 0; nsCOMPtr privateAccessNode =