Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 585064 - Crash (null dereference) [@ -[ChildView inactiveWindowAcceptsMouseEvent:]. r=josh,mstange a=blocking2.0

Browse Source
This commit is contained in:
Steven Michaud 2010-08-09 11:12:50 -05:00
parent da59314c8d
commit c04a0c789a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widget/src/cocoa/nsChildView.mm
View File

@ -5687,6 +5687,10 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
- (BOOL)inactiveWindowAcceptsMouseEvent:(NSEvent*)aEvent
{
// If we're being destroyed assume the default -- return YES.
if (!mGeckoChild)
return YES;
nsMouseEvent geckoEvent(PR_TRUE, NS_MOUSE_ACTIVATE, nsnull, nsMouseEvent::eReal);
[self convertCocoaMouseEvent:aEvent toGeckoEvent:&geckoEvent];
return !mGeckoChild->DispatchWindowEvent(geckoEvent);
@ -6404,6 +6408,9 @@ ChildViewMouseTracker::ViewForEvent(NSEvent* aEvent)
return nil;
ChildView* childView = (ChildView*)view;
// If childView is being destroyed return nil.
if (![childView widget])
return nil;
return WindowAcceptsEvent(window, aEvent, childView) ? childView : nil;
}