Changeset 232802 in webkit

Timestamp:

Jun 13, 2018, 12:10:16 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

TileFirstPaint strategy for async image decoding should be disabled for non root RenderLayers
​https://bugs.webkit.org/show_bug.cgi?id=186336
<rdar://problem/40808099>

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2018-06-13
Reviewed by Simon Fraser.

Source/WebCore:

When showing a composited RenderLayer for the first time, the images in
this layer have to be decoded synchronously to avoid unwanted flashing.

To create a layout test for this patch, FrameDecodingDurationForTesting
needs to be generalized for large and animated images. The decoding thread
now forces the decoding time to be at least equal to
FrameDecodingDurationForTesting.

Test: fast/images/async-image-composited-show.html

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::shouldUseAsyncDecodingForAnimatedImages const):
(WebCore::BitmapImage::internalStartAnimation):
(WebCore::BitmapImage::advanceAnimation):

• platform/graphics/BitmapImage.h:
• platform/graphics/ImageSource.cpp:

(WebCore::ImageSource::startAsyncDecodingQueue):

• platform/graphics/ImageSource.h:

(WebCore::ImageSource::setFrameDecodingDurationForTesting):
(WebCore::ImageSource::frameDecodingDurationForTesting const):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paintLayerContents):

LayoutTests:

• fast/images/async-image-composited-show-expected.html: Added.
• fast/images/async-image-composited-show.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/async-image-composited-show-expected.html (added)
• LayoutTests/fast/images/async-image-composited-show.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/BitmapImage.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/BitmapImage.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/ImageSource.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/ImageSource.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-06-13  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        TileFirstPaint strategy for async image decoding should be disabled for non root RenderLayers
+        https://bugs.webkit.org/show_bug.cgi?id=186336
+        <rdar://problem/40808099>
+
+        Reviewed by Simon Fraser.
+
+        * fast/images/async-image-composited-show-expected.html: Added.
+        * fast/images/async-image-composited-show.html: Added.
+
 2018-06-13  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-13  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        TileFirstPaint strategy for async image decoding should be disabled for non root RenderLayers
+        https://bugs.webkit.org/show_bug.cgi?id=186336
+        <rdar://problem/40808099>
+
+        Reviewed by Simon Fraser.
+
+        When showing a composited RenderLayer for the first time, the images in 
+        this layer have to be decoded synchronously to avoid unwanted flashing.
+
+        To create a layout test for this patch, FrameDecodingDurationForTesting
+        needs to be generalized for large and animated images. The decoding thread
+        now forces the decoding time to be at least equal to 
+        FrameDecodingDurationForTesting.
+
+        Test: fast/images/async-image-composited-show.html
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::shouldUseAsyncDecodingForAnimatedImages const):
+        (WebCore::BitmapImage::internalStartAnimation):
+        (WebCore::BitmapImage::advanceAnimation):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::startAsyncDecodingQueue):
+        * platform/graphics/ImageSource.h:
+        (WebCore::ImageSource::setFrameDecodingDurationForTesting):
+        (WebCore::ImageSource::frameDecodingDurationForTesting const):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintLayerContents):
+
 2018-06-13  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -341 +341 @@
 bool BitmapImage::shouldUseAsyncDecodingForAnimatedImages() const
 {
-    return canAnimate() && m_allowAnimatedImageAsyncDecoding && (shouldUseAsyncDecodingForAnimatedImagesForTesting() || m_source->canUseAsyncDecoding());
+    return canAnimate() && m_allowAnimatedImageAsyncDecoding && (shouldUseAsyncDecodingForTesting() || m_source->canUseAsyncDecoding());
 }
 
@@ -450 +450 @@
         }
 
-        m_desiredFrameDecodeTimeForTesting = time + std::max(m_frameDecodingDurationForTesting, 0_s);
         if (m_clearDecoderAfterAsyncFrameRequestForTesting)
             m_source->resetData(data());
@@ -463 +462 @@
 {
     clearTimer();
-
-    // Pretend as if decoding nextFrame has taken m_frameDecodingDurationForTesting from
-    // the time this decoding was requested.
-    if (shouldUseAsyncDecodingForAnimatedImagesForTesting()) {
-        MonotonicTime time = MonotonicTime::now();
-        // Start a timer with the remaining time from now till the m_desiredFrameDecodeTime.
-        if (m_desiredFrameDecodeTimeForTesting > std::max(time, m_desiredFrameStartTime)) {
-            startTimer(m_desiredFrameDecodeTimeForTesting - time);
-            return;
-        }
-    }
 
     // Don't advance to nextFrame unless its decoding has finished or was not required.

trunk/Source/WebCore/platform/graphics/BitmapImage.h

@@ -103 +103 @@
     bool canAnimate() const;
 
-    bool shouldUseAsyncDecodingForAnimatedImagesForTesting() const { return m_frameDecodingDurationForTesting > 0_s; }
-    void setFrameDecodingDurationForTesting(Seconds duration) { m_frameDecodingDurationForTesting = duration; }
+    bool shouldUseAsyncDecodingForTesting() const { return m_source->frameDecodingDurationForTesting() > 0_s; }
+    void setFrameDecodingDurationForTesting(Seconds duration) { m_source->setFrameDecodingDurationForTesting(duration); }
     bool canUseAsyncDecodingForLargeImages() const;
     bool shouldUseAsyncDecodingForAnimatedImages() const;
@@ -217 +217 @@
 
     std::unique_ptr<Vector<Function<void()>, 1>> m_decodingCallbacks;
-    Seconds m_frameDecodingDurationForTesting;
-    MonotonicTime m_desiredFrameDecodeTimeForTesting;
 
     bool m_animationFinished { false };

trunk/Source/WebCore/platform/graphics/ImageSource.cpp

@@ -326 +326 @@
     decodingQueue().dispatch([protectedThis = makeRef(*this), protectedDecodingQueue = makeRef(decodingQueue()), protectedFrameRequestQueue = makeRef(frameRequestQueue()), protectedDecoder = makeRef(*m_decoder), sourceURL = sourceURL().string().isolatedCopy()] {
         ImageFrameRequest frameRequest;
+        Seconds minDecodingDuration = protectedThis->frameDecodingDurationForTesting();
 
         while (protectedFrameRequestQueue->dequeue(frameRequest)) {
             TraceScope tracingScope(AsyncImageDecodeStart, AsyncImageDecodeEnd);
+
+            MonotonicTime startingTime;
+            if (minDecodingDuration > 0_s)
+                startingTime = MonotonicTime::now();
 
             // Get the frame NativeImage on the decoding thread.
@@ -338 +343 @@
                 continue;
             }
+
+            // Pretend as if the decoding takes minDecodingDuration.
+            if (minDecodingDuration > 0_s)
+                sleep(minDecodingDuration - (MonotonicTime::now() - startingTime));
 
             // Update the cached frames on the main thread to avoid updating the MemoryCache from a different thread.

trunk/Source/WebCore/platform/graphics/ImageSource.h

@@ -82 +82 @@
     bool hasAsyncDecodingQueue() const { return m_decodingQueue; }
     bool isAsyncDecodingQueueIdle() const;
+    void setFrameDecodingDurationForTesting(Seconds duration) { m_frameDecodingDurationForTesting = duration; }
+    Seconds frameDecodingDurationForTesting() const { return m_frameDecodingDurationForTesting; }
 
     // Image metadata which is calculated either by the ImageDecoder or directly
@@ -182 +184 @@
     FrameCommitQueue m_frameCommitQueue;
     RefPtr<WorkQueue> m_decodingQueue;
+    Seconds m_frameDecodingDurationForTesting;
 
     // Image metadata.

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4351 +4351 @@
             paintBehavior |= PaintBehaviorSnapshotting;
         
-        if (paintingInfo.paintBehavior & PaintBehaviorTileFirstPaint)
+        if ((paintingInfo.paintBehavior & PaintBehaviorTileFirstPaint) && isRenderViewLayer())
             paintBehavior |= PaintBehaviorTileFirstPaint;