Changeset 216462 in webkit

Timestamp:

May 8, 2017 4:15:00 PM (7 years ago)

Author:

Jonathan Bedard

Message:

Implement PlatformWebView::windowSnapshotImage and createBitmapContextFromWebView for iOS devices
​https://bugs.webkit.org/show_bug.cgi?id=169421
<rdar://problem/30950171>

Reviewed by Tim Horton.

Tools:

• DumpRenderTree/ios/PixelDumpSupportIOS.mm:

(createBitmapContextFromWebView): Implement for IOSurface.

• WebKitTestRunner/ios/PlatformWebViewIOS.mm:

(WTR::PlatformWebView::windowSnapshotImage): Use snapshot API for device.

LayoutTests:

• platform/ios-device/TestExpectations: Mark compositing tests as failures, this

is due to a bug tracked in ​https://bugs.webkit.org/show_bug.cgi?id=170772.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-device/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (modified) (3 diffs)
• Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-08  Jonathan Bedard  <jbedard@apple.com>
+
+        Implement PlatformWebView::windowSnapshotImage and createBitmapContextFromWebView for iOS devices
+        https://bugs.webkit.org/show_bug.cgi?id=169421
+        <rdar://problem/30950171>
+
+        Reviewed by Tim Horton.
+
+        * platform/ios-device/TestExpectations: Mark compositing tests as failures, this
+        is due to a bug tracked in https://bugs.webkit.org/show_bug.cgi?id=170772.
+
 2017-05-08  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/platform/ios-device/TestExpectations

@@ -4 +4 @@
 #
 
+# https://bugs.webkit.org/show_bug.cgi?id=170772
+compositing/geometry/clipped-out-perspective.html [ ImageOnlyFailure ]
+compositing/hidpi-subpixel-transform-origin.html [ ImageOnlyFailure ]
+compositing/regions/position-layer-inside-region-overflow-hidden.html [ ImageOnlyFailure ]
+compositing/regions/position-layers-inside-region-overflow-hidden.html [ ImageOnlyFailure ]
+compositing/regions/position-layers-inside-regions-overflow-hidden.html [ ImageOnlyFailure ]
+

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-08  Jonathan Bedard  <jbedard@apple.com>
+
+        Implement PlatformWebView::windowSnapshotImage and createBitmapContextFromWebView for iOS devices
+        https://bugs.webkit.org/show_bug.cgi?id=169421
+        <rdar://problem/30950171>
+
+        Reviewed by Tim Horton.
+
+        * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+        (createBitmapContextFromWebView): Implement for IOSurface.
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        (WTR::PlatformWebView::windowSnapshotImage): Use snapshot API for device.
+
 2017-05-08  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm

@@ -39 +39 @@
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <QuartzCore/QuartzCore.h>
+#import <WebCore/CoreGraphicsSPI.h>
+#import <WebCore/GraphicsContextCG.h>
+#import <WebCore/IOSurface.h>
+#import <WebCore/PlatformScreen.h>
 #import <WebCore/QuartzCoreSPI.h>
 #import <WebKit/WebCoreThread.h>
@@ -57 +61 @@
     [CATransaction flush];
 
-#if USE(IOSURFACE)
-    return nullptr;
-#else
     CGFloat deviceScaleFactor = 2; // FIXME: hardcode 2x for now. In future we could respect 1x and 3x as we do on Mac.
-    CATransform3D transform = CATransform3DMakeScale(deviceScaleFactor, deviceScaleFactor, 1);
     
     CGSize viewSize = [[mainFrame webView] frame].size;
     int bufferWidth = ceil(viewSize.width * deviceScaleFactor);
     int bufferHeight = ceil(viewSize.height * deviceScaleFactor);
+
+#if USE(IOSURFACE)
+    WebCore::FloatSize snapshotSize(viewSize);
+    snapshotSize.scale(deviceScaleFactor);
+
+    WebCore::IOSurface::Format snapshotFormat = WebCore::screenSupportsExtendedColor() ? WebCore::IOSurface::Format::RGB10 : WebCore::IOSurface::Format::RGBA;
+    auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(snapshotSize), WebCore::sRGBColorSpaceRef(), snapshotFormat);
+    RetainPtr<CGImageRef> cgImage = surface->createImage();
+
+    void* bitmapBuffer = nullptr;
+    size_t bitmapRowBytes = 0;
+    auto bitmapContext = createBitmapContext(bufferWidth, bufferHeight, bitmapRowBytes, bitmapBuffer);
+    if (!bitmapContext)
+        return nullptr;
+
+    CGContextDrawImage(bitmapContext->cgContext(), CGRectMake(0, 0, bufferWidth, bufferHeight), cgImage.get());
+    return bitmapContext;
+#else
+    CATransform3D transform = CATransform3DMakeScale(deviceScaleFactor, deviceScaleFactor, 1);
+    static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
 
     CARenderServerBufferRef buffer = CARenderServerCreateBuffer(bufferWidth, bufferHeight);
@@ -78 +98 @@
     size_t rowBytes = CARenderServerGetBufferRowBytes(buffer);
 
-    static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
     RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithData(0, data, CARenderServerGetBufferDataSize(buffer), nullptr));
     

trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm

@@ -33 +33 @@
 #import <WebKit/WKImageCG.h>
 #import <WebKit/WKPreferencesPrivate.h>
+#import <WebKit/WKSnapshotConfiguration.h>
 #import <WebKit/WKWebViewConfiguration.h>
 #import <WebKit/WKWebViewPrivate.h>
@@ -305 +306 @@
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 #if USE(IOSURFACE)
-    return nullptr;
+    __block bool isDone = false;
+    __block RetainPtr<CGImageRef> result;
+    
+    RetainPtr<WKSnapshotConfiguration> snapshotConfiguration = adoptNS([[WKSnapshotConfiguration alloc] init]);
+    [snapshotConfiguration setRect:CGRectMake(0, 0, m_view.frame.size.width, m_view.frame.size.height)];
+    [snapshotConfiguration setSnapshotWidth:@(m_view.frame.size.width)];
+    
+    [m_view takeSnapshotWithConfiguration:snapshotConfiguration.get() completionHandler:^(UIImage *snapshotImage, NSError *error) {
+        if (!error)
+            result = [snapshotImage CGImage];
+        isDone = true;
+    }];
+    while (!isDone)
+        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+    return result;
+
 #else
     CGFloat deviceScaleFactor = 2; // FIXME: hardcode 2x for now. In future we could respect 1x and 3x as we do on Mac.