Bug 612090 - Firefox 4.0b7 crash [@ nsBaseWidget::AutoUseBasicLayerManager::AutoUseBasicLayerManager ]; r=joe a=blocking-betaN+
authorMarkus Stange <mstange@themasta.com>
Fri, 19 Nov 2010 12:37:18 -0500
changeset 57913 4eeb36eb555f2d94fca2dbcbc021da23fc4c3a2e
parent 57912 18864f1a6b42e0984b7a0a15574c06f29a43b97b
child 57914 509c3d710e15d16d6b9b8bce94c68fa089289361
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersjoe, blocking-betaN
bugs612090
milestone2.0b8pre
Bug 612090 - Firefox 4.0b7 crash [@ nsBaseWidget::AutoUseBasicLayerManager::AutoUseBasicLayerManager ]; r=joe a=blocking-betaN+
editor/libeditor/html/tests/browserscope/lib/richtext/LICENSE
editor/libeditor/html/tests/browserscope/lib/richtext/README
editor/libeditor/html/tests/browserscope/lib/richtext/README.Mozilla
editor/libeditor/html/tests/browserscope/lib/richtext/currentStatus.js
editor/libeditor/html/tests/browserscope/lib/richtext/current_revision
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/editable.html
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/js/range.js
editor/libeditor/html/tests/browserscope/lib/richtext/richtext/richtext.html
editor/libeditor/html/tests/browserscope/lib/richtext/update_from_upstream
editor/libeditor/html/tests/browserscope/test_richtext.html
widget/src/cocoa/nsChildView.mm
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -2642,16 +2642,19 @@ NSEvent* gLastDragMouseDownEvent = nil;
     [(BaseWindow*)[self window] deferredInvalidateShadow];
   }
 
   [self endMaybeResetUnifiedToolbar:oldHeight];
 }
 
 - (void)drawRect:(NSRect)aRect inTitlebarContext:(CGContextRef)aContext
 {
+  if (!mGeckoChild)
+    return;
+
   // Title bar drawing only works if we really draw into aContext, which only
   // the basic layer manager will do.
   nsBaseWidget::AutoUseBasicLayerManager setupLayerManager(mGeckoChild);
   [self drawRect:aRect inContext:aContext];
 }
 
 - (void)drawRect:(NSRect)aRect inContext:(CGContextRef)aContext
 {