Changeset 93653 in webkit

Timestamp:

Aug 23, 2011 4:18:34 PM (13 years ago)

Author:

caryclark@google.com

Message:

Turn WebCanvas into CGContext before drawing scrollbar (DRT using Skia on Mac)
​https://bugs.webkit.org/show_bug.cgi?id=66803

This fixes the WebKit Canaries, in particular avoids a crash on tests
like css1/basic/comments.html.

Reviewed by James Robinson.

• DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:

(WebThemeEngineDRTMac::paintNSScrollerScrollbarThumb):
The NSGraphicsContext call graphicsContextWithGraphicsPort takes a void*
parameter, so it took a WebCanvas* (mapped to SkCanvas* in Skia-land)
and treated it as if it were a CGContextRef.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/WebThemeEngineDRTMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-23  Cary Clark  <caryclark@google.com>
+
+        Turn WebCanvas into CGContext before drawing scrollbar (DRT using Skia on Mac)
+        https://bugs.webkit.org/show_bug.cgi?id=66803
+
+        This fixes the WebKit Canaries, in particular avoids a crash on tests
+        like css1/basic/comments.html.
+
+        Reviewed by James Robinson.
+
+        * DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:
+        (WebThemeEngineDRTMac::paintNSScrollerScrollbarThumb):
+        The NSGraphicsContext call graphicsContextWithGraphicsPort takes a void*
+        parameter, so it took a WebCanvas* (mapped to SkCanvas* in Skia-land)
+        and treated it as if it were a CGContextRef.
+
 2011-08-23  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm

@@ -177 +177 @@
 
     NSGraphicsContext* previousGraphicsContext = [NSGraphicsContext currentContext];
-    NSGraphicsContext* nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:canvas flipped:YES];
+#if WEBKIT_USING_SKIA
+    gfx::SkiaBitLocker bitLocker(canvas);
+    CGContextRef cgContext = bitLocker.cgContext();
+#else
+    CGContextRef cgContext = canvas;
+#endif
+    NSGraphicsContext* nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES];
     [NSGraphicsContext setCurrentContext:nsGraphicsContext];