Changeset 254696 in webkit

Timestamp:

Jan 16, 2020 11:07:28 AM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r254692. rdar://problem/58480028

REGRESSION (r254291): [ Catalina wk2 Debug ] Flaky ASSERT on fast/images/animated-image-loop-count.html
​https://bugs.webkit.org/show_bug.cgi?id=206068
<rdar://problem/58480028>

Patch by Chris Lord <Chris Lord> on 2020-01-16
Reviewed by Chris Dumez.

No new tests, covered by existing tests.

• platform/graphics/ImageSource.cpp: (WebCore::ImageSource::startAsyncDecodingQueue):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254692 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610.1.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (3 diffs)

branches/safari-610.1.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-16  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254692. rdar://problem/58480028
+
+    REGRESSION (r254291): [ Catalina wk2 Debug ] Flaky ASSERT on fast/images/animated-image-loop-count.html
+    https://bugs.webkit.org/show_bug.cgi?id=206068
+    <rdar://problem/58480028>
+    
+    Patch by Chris Lord <clord@igalia.com> on 2020-01-16
+    Reviewed by Chris Dumez.
+    
+    No new tests, covered by existing tests.
+    
+    * platform/graphics/ImageSource.cpp:
+    (WebCore::ImageSource::startAsyncDecodingQueue):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-16  Chris Lord  <clord@igalia.com>
+
+            REGRESSION (r254291): [ Catalina wk2 Debug ] Flaky ASSERT on fast/images/animated-image-loop-count.html
+            https://bugs.webkit.org/show_bug.cgi?id=206068
+            <rdar://problem/58480028>
+
+            Reviewed by Chris Dumez.
+
+            No new tests, covered by existing tests.
+
+            * platform/graphics/ImageSource.cpp:
+            (WebCore::ImageSource::startAsyncDecodingQueue):
+
 2020-01-15  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-610.1.1-branch/Source/WebCore/platform/graphics/ImageSource.cpp

@@ -346 +346 @@
         return;
 
+    // Async decoding is only enabled for HTMLImageElement and CSS background images.
+    ASSERT(isMainThread());
+
     // We need to protect this, m_decodingQueue and m_decoder from being deleted while we are in the decoding loop.
-    decodingQueue().dispatch([protectedThis = makeRef(*this), protectedDecodingQueue = makeRef(decodingQueue()), protectedFrameRequestQueue = makeRef(frameRequestQueue()), protectedDecoder = makeRef(*m_decoder), sourceURL = sourceURL().string().isolatedCopy()] {
+    decodingQueue().dispatch([protectedThis = makeRef(*this), protectedDecodingQueue = makeRef(decodingQueue()), protectedFrameRequestQueue = makeRef(frameRequestQueue()), protectedDecoder = makeRef(*m_decoder), sourceURL = sourceURL().string().isolatedCopy()] () mutable {
         ImageFrameRequest frameRequest;
         Seconds minDecodingDuration = protectedThis->frameDecodingDurationForTesting();
@@ -372 +375 @@
 
             // Update the cached frames on the creation thread to avoid updating the MemoryCache from a different thread.
-            protectedThis->m_runLoop.dispatch([protectedThis = protectedThis.copyRef(), protectedQueue = protectedDecodingQueue.copyRef(), protectedDecoder = protectedDecoder.copyRef(), sourceURL = sourceURL.isolatedCopy(), nativeImage = WTFMove(nativeImage), frameRequest] () mutable {
+            callOnMainThread([protectedThis = protectedThis.copyRef(), protectedQueue = protectedDecodingQueue.copyRef(), protectedDecoder = protectedDecoder.copyRef(), sourceURL = sourceURL.isolatedCopy(), nativeImage = WTFMove(nativeImage), frameRequest] () mutable {
                 // The queue may have been closed if after we got the frame NativeImage, stopAsyncDecodingQueue() was called.
                 if (protectedQueue.ptr() == protectedThis->m_decodingQueue && protectedDecoder.ptr() == protectedThis->m_decoder) {
@@ -382 +385 @@
             });
         }
+
+        // Ensure destruction happens on creation thread.
+        callOnMainThread([protectedThis = WTFMove(protectedThis), protectedQueue = WTFMove(protectedDecodingQueue), protectedDecoder = WTFMove(protectedDecoder)] () mutable { });
     });
 }