Changeset 265116 in webkit

Timestamp:

Jul 30, 2020 4:22:55 PM (4 years ago)

Author:

dino@apple.com

Message:

[WebGL] Safari snapshots of WebGL content in the tab picker don't work
​https://bugs.webkit.org/show_bug.cgi?id=214452
<rdar://problem/21243082>

Source/WebCore:

Original patch by Justin Fan. Reviewed by Darin Adler.

Test is in TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm.

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::paint): Will properly request a paint when a snapshot is requested.

• html/HTMLCanvasElement.h:
• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::paintRenderingResultsToCanvas): Only clear the last snapshot if readPixels will succeed.

• rendering/RenderHTMLCanvas.cpp:

(WebCore::RenderHTMLCanvas::paintReplaced):

Tools:

Test for snapshotting. Marked as PLATFORM(MAC) for now.

• TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm:

(TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.h (modified) (2 diffs)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderHTMLCanvas.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-30  Dean Jackson  <dino@apple.com>
+
+        [WebGL] Safari snapshots of WebGL content in the tab picker don't work
+        https://bugs.webkit.org/show_bug.cgi?id=214452
+        <rdar://problem/21243082>
+
+        Original patch by Justin Fan. Reviewed by Darin Adler.
+
+        Test is in TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::paint): Will properly request a paint when a snapshot is requested.
+        * html/HTMLCanvasElement.h:
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::paintRenderingResultsToCanvas): Only clear the last snapshot if readPixels will succeed.
+        * rendering/RenderHTMLCanvas.cpp:
+        (WebCore::RenderHTMLCanvas::paintReplaced):
+
 2020-07-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -636 +636 @@
 
         if (m_context) {
-            shouldPaint = paintsIntoCanvasBuffer() || document().printing();
+            shouldPaint = paintsIntoCanvasBuffer() || document().printing() || m_isSnapshotting;
             if (shouldPaint)
                 m_context->paintRenderingResultsToCanvas();

trunk/Source/WebCore/html/HTMLCanvasElement.h

@@ -133 +133 @@
     void prepareForDisplay();
 
+    void setIsSnapshotting(bool isSnapshotting) { m_isSnapshotting = isSnapshotting; }
+    bool isSnapshotting() const { return m_isSnapshotting; }
+
 private:
     HTMLCanvasElement(const QualifiedName&, Document&);
@@ -188 +191 @@
     bool m_hasRelevantWebGLEventListener { false };
 #endif
+
+    bool m_isSnapshotting { false };
 
     mutable RefPtr<Image> m_presentedImage;

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -1189 +1189 @@
         return;
 
-    if (canvas->document().printing())
+    if (canvas->document().printing() || (canvas->isSnapshotting() && canvas->document().page()->isVisible()))
         canvas->clearPresentationCopy();
 
@@ -1195 +1195 @@
     // happened after it was composited should be ignored by the compositor.
     if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) {
-        m_context->paintCompositedResultsToCanvas(canvas->buffer());
+        m_context->paintRenderingResultsToCanvas(canvas->buffer());
 
         canvas->makePresentationCopy();

trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

@@ -93 +93 @@
 
     InterpolationQualityMaintainer interpolationMaintainer(context, ImageQualityController::interpolationQualityFromStyle(style()));
+
+    canvasElement().setIsSnapshotting(paintInfo.paintBehavior.contains(PaintBehavior::Snapshotting));
     canvasElement().paint(context, replacedContentRect);
+    canvasElement().setIsSnapshotting(false);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-07-30  Dean Jackson  <dino@apple.com>
+
+        [WebGL] Safari snapshots of WebGL content in the tab picker don't work
+        https://bugs.webkit.org/show_bug.cgi?id=214452
+        <rdar://problem/21243082>
+
+        Test for snapshotting. Marked as PLATFORM(MAC) for now.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm:
+        (TEST):
+
 2020-07-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewSnapshot.mm

@@ -421 +421 @@
     TestWebKitAPI::Util::run(&isDone);
 }
+
+// FIXME: Confirm that this works on iOS too.
+#if PLATFORM(MAC)
+TEST(WKWebView, SnapshotWebGL)
+{
+    NSInteger viewWidth = 800;
+    NSInteger viewHeight = 600;
+    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, viewWidth, viewHeight)]);
+
+    RetainPtr<PlatformWindow> window;
+    CGFloat backingScaleFactor;
+
+#if PLATFORM(MAC)
+    window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
+    [[window contentView] addSubview:webView.get()];
+    backingScaleFactor = [window backingScaleFactor];
+#elif PLATFORM(IOS_FAMILY)
+    window = adoptNS([[UIWindow alloc] initWithFrame:[webView frame]]);
+    [window addSubview:webView.get()];
+    backingScaleFactor = [[window screen] scale];
+#endif
+
+    [webView loadHTMLString:@"<style>body{margin:0;padding:0}</style><canvas></canvas><script>window.addEventListener('load', () => { let ctx = document.querySelector('canvas').getContext('webgl'); ctx.clearColor(0, 1, 0, 1); ctx.clear(ctx.COLOR_BUFFER_BIT); }, false);</script>" baseURL:nil];
+    [webView _test_waitForDidFinishNavigation];
+
+    RetainPtr<WKSnapshotConfiguration> snapshotConfiguration = adoptNS([[WKSnapshotConfiguration alloc] init]);
+    [snapshotConfiguration setRect:NSMakeRect(0, 0, viewWidth, viewHeight)];
+    [snapshotConfiguration setSnapshotWidth:@(viewWidth)];
+    [snapshotConfiguration setAfterScreenUpdates:YES];
+
+    isDone = false;
+    [webView takeSnapshotWithConfiguration:snapshotConfiguration.get() completionHandler:^(PlatformImage snapshotImage, NSError *error) {
+        EXPECT_NULL(error);
+
+        EXPECT_EQ(viewWidth, snapshotImage.size.width);
+
+        RetainPtr<CGImageRef> cgImage = convertToCGImage(snapshotImage);
+        RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
+
+        NSInteger viewWidthInPixels = viewWidth * backingScaleFactor;
+        NSInteger viewHeightInPixels = viewHeight * backingScaleFactor;
+
+        uint8_t *rgba = (unsigned char *)calloc(viewWidthInPixels * viewHeightInPixels * 4, sizeof(unsigned char));
+        RetainPtr<CGContextRef> context = CGBitmapContextCreate(rgba, viewWidthInPixels, viewHeightInPixels, 8, 4 * viewWidthInPixels, colorSpace.get(), kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
+        CGContextDrawImage(context.get(), CGRectMake(0, 0, viewWidthInPixels, viewHeightInPixels), cgImage.get());
+
+        NSInteger pixelIndex = getPixelIndex(0, 0, viewWidthInPixels);
+        EXPECT_EQ(0, rgba[pixelIndex]);
+        EXPECT_EQ(255, rgba[pixelIndex + 1]);
+        EXPECT_EQ(0, rgba[pixelIndex + 2]);
+        EXPECT_EQ(255, rgba[pixelIndex + 3]);
+
+        free(rgba);
+
+        isDone = true;
+    }];
+
+    TestWebKitAPI::Util::run(&isDone);
+}
+#endif