Changeset 152315 in webkit

Timestamp:

Jul 2, 2013 12:50:24 PM (11 years ago)

Author:

andersca@apple.com

Message:

Always flip the coordinate system before drawing NSViews from Widget::paint
​https://bugs.webkit.org/show_bug.cgi?id=118318
<rdar://problem/13895483>

Reviewed by Beth Dakin.

Undo the change that would not flip on 10.9; turns out the bug was in AppKit. Also remove the
_hasCanDrawSubviewsIntoLayerOrAncestor workaround since drawing works correctly now.

Also, pass flipped:NO when creating the NSGraphicsContext to indicate that the graphics context
is unflipped as far as AppKit knows (since we flipped it earlier).

• platform/mac/WidgetMac.mm:

(WebCore::Widget::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WidgetMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Anders Carlsson  <andersca@apple.com>
+
+        Always flip the coordinate system before drawing NSViews from Widget::paint
+        https://bugs.webkit.org/show_bug.cgi?id=118318
+        <rdar://problem/13895483>
+
+        Reviewed by Beth Dakin.
+
+        Undo the change that would not flip on 10.9; turns out the bug was in AppKit. Also remove the
+        _hasCanDrawSubviewsIntoLayerOrAncestor workaround since drawing works correctly now.
+
+        Also, pass flipped:NO when creating the NSGraphicsContext to indicate that the graphics context
+        is unflipped as far as AppKit knows (since we flipped it earlier).
+
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::paint):
+
 2013-06-26  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/platform/mac/WidgetMac.mm

@@ -55 +55 @@
 @interface NSView (Widget)
 - (void)visibleRectDidChange;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-- (BOOL)_hasCanDrawSubviewsIntoLayerOrAncestor;
-#endif
 @end
 
@@ -212 +209 @@
     RefPtr<Widget> protectedThis(this);
 
-    BOOL hasCanDrawSubviewsIntoLayerOrAncestor = NO;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    hasCanDrawSubviewsIntoLayerOrAncestor = [view _hasCanDrawSubviewsIntoLayerOrAncestor];
-#endif
-    
     NSGraphicsContext *currentContext = [NSGraphicsContext currentContext];
-    if (currentContext == [[view window] graphicsContext] || ![currentContext isDrawingToScreen] || hasCanDrawSubviewsIntoLayerOrAncestor) {
+    if (currentContext == [[view window] graphicsContext] || ![currentContext isDrawingToScreen]) {
         // This is the common case of drawing into a window or an inclusive layer, or printing.
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -250 +242 @@
     NSRect viewFrame = [view frame];
     NSRect viewBounds = [view bounds];
+
     // Set up the translation and (flipped) orientation of the graphics context. In normal drawing, AppKit does it as it descends down
-    // the view hierarchy.
-    bool shouldFlipContext = true;
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    shouldFlipContext = false;
-#endif
-    if (shouldFlipContext) {
-        CGContextTranslateCTM(cgContext, viewFrame.origin.x - viewBounds.origin.x, viewFrame.origin.y + viewFrame.size.height + viewBounds.origin.y);
-        CGContextScaleCTM(cgContext, 1, -1);
-    } else
-        CGContextTranslateCTM(cgContext, viewFrame.origin.x - viewBounds.origin.x, viewFrame.origin.y + viewBounds.origin.y);
+    // the view hierarchy. Since Widget::paint is always called with a context that has a flipped coordinate system, and
+    // -[NSView displayRectIgnoringOpacity:inContext:] expects an unflipped context we always flip here.
+    CGContextTranslateCTM(cgContext, viewFrame.origin.x - viewBounds.origin.x, viewFrame.origin.y + viewFrame.size.height + viewBounds.origin.y);
+    CGContextScaleCTM(cgContext, 1, -1);
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     {
-        NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:YES];
+        NSGraphicsContext *nsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:cgContext flipped:NO];
         [view displayRectIgnoringOpacity:[view convertRect:r fromView:[view superview]] inContext:nsContext];
     }