Changeset 247466 in webkit

Timestamp:

Jul 15, 2019 7:32:43 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[ Mojave WK1 ] Some Image tests are flakey failures and are failing in tandem with zoomed in or blank image results
​https://bugs.webkit.org/show_bug.cgi?id=193108

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-07-15
Reviewed by Simon Fraser.

Add a workaround for <rdar://problem/17084993> in createBitmapContextFromWebView().
Re-request the snapshot at kCGWindowImageNominalResolution if it was captured
at the wrong scale.

• DumpRenderTree/mac/PixelDumpSupportMac.mm:

(takeWindowSnapshot):
(createBitmapContextFromWebView):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/PixelDumpSupportMac.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-15  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [ Mojave WK1 ] Some Image tests are flakey failures and are failing in tandem with zoomed in or blank image results
+        https://bugs.webkit.org/show_bug.cgi?id=193108
+
+        Reviewed by Simon Fraser.
+
+        Add a workaround for <rdar://problem/17084993> in createBitmapContextFromWebView().
+        Re-request the snapshot at kCGWindowImageNominalResolution if it was captured
+        at the wrong scale.
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (takeWindowSnapshot):
+        (createBitmapContextFromWebView):
+
 2019-07-15  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm

@@ -37 +37 @@
 #import <CoreGraphics/CGBitmapContext.h>
 #import <QuartzCore/QuartzCore.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <wtf/Assertions.h>
 #import <wtf/RefPtr.h>
@@ -81 +82 @@
     CGContextEndTransparencyLayer(context);
     CGContextRestoreGState(context);
+}
+
+static CGImageRef takeWindowSnapshot(CGSWindowID windowID, CGWindowImageOption imageOptions)
+{
+    imageOptions |= kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque;
+    return CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
 }
 
@@ -129 +136 @@
             // Ask the window server to provide us a composited version of the *real* window content including surfaces (i.e. OpenGL content)
             // Note that the returned image might differ very slightly from the window backing because of dithering artifacts in the window server compositor.
-            CGImageRef image = CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, [[view window] windowNumber], kCGWindowImageBoundsIgnoreFraming | kCGWindowImageShouldBeOpaque);
+            NSWindow *window = [view window];
+            CGImageRef image = takeWindowSnapshot([window windowNumber], kCGWindowImageDefault);
+
+            if (image) {
+                // Work around <rdar://problem/17084993>; re-request the snapshot at kCGWindowImageNominalResolution if it was captured at the wrong scale.
+                CGFloat desiredSnapshotWidth = window.frame.size.width * deviceScaleFactor;
+                if (CGImageGetWidth(image) != desiredSnapshotWidth)
+                    image = takeWindowSnapshot([window windowNumber], kCGWindowImageNominalResolution);
+            }
+
+            if (!image)
+                return nullptr;
+
             CGContextDrawImage(context, CGRectMake(0, 0, CGImageGetWidth(image), CGImageGetHeight(image)), image);
             CGImageRelease(image);