Changeset 20152 in webkit

Timestamp:

Mar 13, 2007 11:22:43 AM (17 years ago)

Author:

darin

Message:

Reviewed by Tim Hatcher and John Sullivan.

• fix <rdar://problem/4915303> CrashTracer: 36 crashes in Safari at com.apple.AppKit: -[NSView getRectsBeingDrawn:count:] + 502

• page/mac/FrameMac.mm: (WebCore::Frame::imageFromRect): This was calling drawRect: directly, but NSView's getRectsBeingDrawn:count: method was never really safe to call unless it was AppKit that called your drawRect: method. Changed it to call drawSingleRect: instead. A little ugly, but seems to work and will almost certainly fix the bug.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/FrameMac.mm (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher and John Sullivan.
+
+        - fix <rdar://problem/4915303> CrashTracer: 36 crashes in Safari at
+          com.apple.AppKit: -[NSView getRectsBeingDrawn:count:] + 502
+
+        * page/mac/FrameMac.mm: (WebCore::Frame::imageFromRect):
+        This was calling drawRect: directly, but NSView's getRectsBeingDrawn:count:
+        method was never really safe to call unless it was AppKit that called your
+        drawRect: method. Changed it to call drawSingleRect: instead. A little ugly,
+        but seems to work and will almost certainly fix the bug.
+
 2007-03-13  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/page/mac/FrameMac.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Trolltech ASA
@@ -100 +100 @@
 @end
  
+@interface NSView (WebCoreHTMLDocumentView)
+- (void)drawSingleRect:(NSRect)rect;
+@end
+ 
 using namespace std;
 using namespace KJS::Bindings;
@@ -325 +329 @@
     if (!view)
         return nil;
+    if (![view respondsToSelector:@selector(drawSingleRect:)])
+        return nil;
     
     NSImage* resultImage;
@@ -342 +348 @@
         [resultImage setFlipped:YES];
         [resultImage lockFocus];
-
         CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-
         CGContextSaveGState(context);
         CGContextTranslateCTM(context, bounds.origin.x - rect.origin.x, bounds.origin.y - rect.origin.y);
-        [view drawRect:rect];
+
+        // Note: Must not call drawRect: here, because drawRect: assumes that it's called from AppKit's
+        // display machinery. It calls getRectsBeingDrawn:count:, which can only be called inside
+        // when a real AppKit display is underway.
+        [view drawSingleRect:rect];
+
         CGContextRestoreGState(context);
         [resultImage unlockFocus];