Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a kungFuDeathGrip to make sure our synthetic mouse events don't kill us,

Browse Source 
and make sure to RevokeEvent on all viewmanagers.  Bug 277234, r=dbaron,
sr=darin, a=asa


git-svn-id: svn://10.0.0.236/trunk@167378 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-01-07 03:23:34 +00:00
parent 97073959b6
commit 1a63cd9316
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/view/src/nsViewManager.cpp
View File

@@ -360,8 +360,10 @@ static void* PR_CALLBACK HandlePLEvent(PLEvent* aEvent)
// Search for valid view manager before trying to access it. This
// is working around a bug in RevokeEvents.
const nsVoidArray *vmArray = nsViewManager::GetViewManagerArray();
NS_ENSURE_TRUE(vmArray && vmArray->IndexOf(event->ViewManager()) != -1,
nsnull);
if (!vmArray || vmArray->IndexOf(event->ViewManager()) == -1) {
NS_ERROR("RevokeEvents is buggy. Fix it!");
return nsnull;
}
event->HandleEvent();
return nsnull;
@@ -493,13 +495,15 @@ nsViewManager::~nsViewManager()
mRootView = nsnull;
}
if (IsRootVM()) {
nsCOMPtr<nsIEventQueue> eventQueue;
mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
getter_AddRefs(eventQueue));
NS_ASSERTION(nsnull != eventQueue, "Event queue is null");
eventQueue->RevokeEvents(this);
} else {
// Make sure to RevokeEvents for all viewmanagers, since some events
// are posted by a non-root viewmanager.
nsCOMPtr<nsIEventQueue> eventQueue;
mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
getter_AddRefs(eventQueue));
NS_ASSERTION(eventQueue, "Event queue is null");
eventQueue->RevokeEvents(this);
if (!IsRootVM()) {
// We have a strong ref to mRootViewManager
NS_IF_RELEASE(mRootViewManager);
}
@@ -4234,6 +4238,10 @@ nsViewManager::ProcessSynthMouseMoveEvent(PRBool aFromScroll)
return;
}
// Hold a ref to ourselves so DispatchEvent won't destroy us (since
// we need to access members after we call DispatchEvent).
nsCOMPtr<nsIViewManager> kungFuDeathGrip(this);
#ifdef DEBUG_MOUSE_LOCATION
printf("[vm=%p]synthesizing mouse move to (%d,%d)\n",
this, mMouseLocation.x, mMouseLocation.y);