Changeset 93724 in webkit

Timestamp:

Aug 24, 2011, 1:04:44 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Crash when restoring NSGraphicsContext when running the Chromium GPU layout tests on Mac
​https://bugs.webkit.org/show_bug.cgi?id=66875

Patch by Avi Drissman <​avi@google.com> on 2011-08-24
Reviewed by James Robinson.

• DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:

(WebThemeEngineDRTMac::paintNSScrollerScrollbarThumb):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-24  Avi Drissman  <avi@google.com>
+
+        Crash when restoring NSGraphicsContext when running the Chromium GPU layout tests on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=66875
+
+        Reviewed by James Robinson.
+
+        * DumpRenderTree/chromium/WebThemeEngineDRTMac.mm:
+        (WebThemeEngineDRTMac::paintNSScrollerScrollbarThumb):
+
 2011-08-23  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/WebThemeEngineDRTMac.mm

@@ -161 +161 @@
     const WebThemeEngine::ScrollbarInfo& scrollbarInfo)
 {
+    [NSGraphicsContext saveGraphicsState];
     NSScroller* scroller = [[NSScroller alloc] initWithFrame:NSMakeRect(rect.x, rect.y, rect.width, rect.height)];
     [scroller setEnabled:state != WebThemeEngine::StateDisabled];
@@ -176 +177 @@
     [scroller setKnobProportion: knobProportion];
 
-    NSGraphicsContext* previousGraphicsContext = [NSGraphicsContext currentContext];
 #if WEBKIT_USING_SKIA
     gfx::SkiaBitLocker bitLocker(canvas);
@@ -189 +189 @@
     // Force it to draw in the right location by translating the whole graphics
     // context.
-    [nsGraphicsContext saveGraphicsState];
+    CGContextSaveGState(cgContext);
     NSAffineTransform *transform = [NSAffineTransform transform];
     [transform translateXBy:rect.x yBy:rect.y];
@@ -195 +195 @@
 
     [scroller drawKnob];
+    CGContextRestoreGState(cgContext);
 
     [scroller release];
 
-    [nsGraphicsContext restoreGraphicsState];
-    [NSGraphicsContext setCurrentContext:previousGraphicsContext];
-}
+    [NSGraphicsContext restoreGraphicsState];
+}