Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-08 14:03:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 708278 - Prevent recursion in ReportMoveEvent(), which can become infinite. r=bgirard a=maconly

Browse Source
This commit is contained in:
Steven Michaud 2011-12-13 10:55:16 -06:00
parent 6991ff4007
commit b723654ff1
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/src/cocoa/nsCocoaWindow.h
View File

@ -342,6 +342,8 @@ protected:
bool mFullScreen;
bool mModal;
bool mInReportMoveEvent; // true if in a call to ReportMoveEvent().
PRInt32 mNumModalDescendents;
InputContext mInputContext;
};

12
widget/src/cocoa/nsCocoaWindow.mm
View File

@ -139,6 +139,7 @@ nsCocoaWindow::nsCocoaWindow()
, mSheetNeedsShow(false)
, mFullScreen(false)
, mModal(false)
, mInReportMoveEvent(false)
, mNumModalDescendents(0)
{
@ -1364,6 +1365,15 @@ nsCocoaWindow::ReportMoveEvent()
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
// Prevent recursion, which can become infinite (see bug 708278). This
// can happen when the call to [NSWindow setFrameTopLeftPoint:] in
// nsCocoaWindow::Move() triggers an immediate NSWindowDidMove notification
// (and a call to [WindowDelegate windowDidMove:]).
if (mInReportMoveEvent) {
return;
}
mInReportMoveEvent = true;
UpdateBounds();
// Dispatch the move event to Gecko
@ -1374,6 +1384,8 @@ nsCocoaWindow::ReportMoveEvent()
nsEventStatus status = nsEventStatus_eIgnore;
DispatchEvent(&guiEvent, status);
mInReportMoveEvent = false;
NS_OBJC_END_TRY_ABORT_BLOCK;
}