Changeset 250782 in webkit

Timestamp:

Oct 7, 2019 11:58:23 AM (5 years ago)

Author:

Chris Dumez

Message:

PendingImageBitmap should not prevent entering the back/forward cache
​https://bugs.webkit.org/show_bug.cgi?id=202585

Reviewed by Tim Horton.

Source/WebCore:

Add PageCache support to PendingImageBitmap by doing the promise resolution on a
SuspendableTimer (which properly gets paused while in PageCache).

Test: fast/history/page-cache-createImageBitmap.html

• html/ImageBitmap.cpp:

LayoutTests:

Add layout test coverage.

• TestExpectations:
• fast/history/page-cache-createImageBitmap-expected.txt: Added.
• fast/history/page-cache-createImageBitmap.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/history/page-cache-createImageBitmap-expected.txt (added)
• LayoutTests/fast/history/page-cache-createImageBitmap.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/ImageBitmap.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-10-07  Chris Dumez  <cdumez@apple.com>
+
+        PendingImageBitmap should not prevent entering the back/forward cache
+        https://bugs.webkit.org/show_bug.cgi?id=202585
+
+        Reviewed by Tim Horton.
+
+        Add layout test coverage.
+
+        * TestExpectations:
+        * fast/history/page-cache-createImageBitmap-expected.txt: Added.
+        * fast/history/page-cache-createImageBitmap.html: Added.
+
 2019-10-07  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -263 +263 @@
 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html [ DumpJSConsoleLogInStdErr ]
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-cors-xhr.https.html [ DumpJSConsoleLogInStdErr ]
+fast/history/page-cache-createImageBitmap.html [ DumpJSConsoleLogInStdErr ]
 
 webkit.org/b/202495 imported/w3c/web-platform-tests/shadow-dom/directionality-002.tentative.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-07  Chris Dumez  <cdumez@apple.com>
+
+        PendingImageBitmap should not prevent entering the back/forward cache
+        https://bugs.webkit.org/show_bug.cgi?id=202585
+
+        Reviewed by Tim Horton.
+
+        Add PageCache support to PendingImageBitmap by doing the promise resolution on a
+        SuspendableTimer (which properly gets paused while in PageCache).
+
+        Test: fast/history/page-cache-createImageBitmap.html
+
+        * html/ImageBitmap.cpp:
+
 2019-10-07  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/html/ImageBitmap.cpp

@@ -46 +46 @@
 #include "RenderElement.h"
 #include "SharedBuffer.h"
+#include "SuspendableTimer.h"
 #include "TypedOMCSSImageValue.h"
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/Optional.h>
+#include <wtf/Scope.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Variant.h>
@@ -526 +528 @@
 
 class PendingImageBitmap final : public ActiveDOMObject, public FileReaderLoaderClient {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     static void fetch(ScriptExecutionContext& scriptExecutionContext, RefPtr<Blob>&& blob, ImageBitmapOptions&& options, Optional<IntRect> rect, ImageBitmap::Promise&& promise)
@@ -541 +544 @@
         , m_rect(WTFMove(rect))
         , m_promise(WTFMove(promise))
+        , m_createImageBitmapTimer(&scriptExecutionContext, *this, &PendingImageBitmap::createImageBitmapAndResolvePromise)
     {
         suspendIfNeeded();
+        m_createImageBitmapTimer.suspendIfNeeded();
     }
 
@@ -552 +557 @@
     // ActiveDOMObject
 
-    const char* activeDOMObjectName() const override
+    const char* activeDOMObjectName() const final
     {
         return "PendingImageBitmap";
     }
 
-    bool canSuspendForDocumentSuspension() const override
-    {
-        // FIXME: Deal with suspension.
-        return false;
+    bool canSuspendForDocumentSuspension() const final
+    {
+        return true;
+    }
+
+    void stop() final
+    {
+        delete this;
     }
 
@@ -575 +584 @@
     void didFinishLoading() override
     {
-        createImageBitmap(m_blobLoader.arrayBufferResult());
-        delete this;
+        createImageBitmapAndResolvePromiseSoon(m_blobLoader.arrayBufferResult());
     }
 
     void didFail(int) override
     {
-        createImageBitmap(nullptr);
-        delete this;
-    }
-
-    void createImageBitmap(RefPtr<ArrayBuffer>&& arrayBuffer)
-    {
-        if (!arrayBuffer) {
+        createImageBitmapAndResolvePromiseSoon(nullptr);
+    }
+
+    void createImageBitmapAndResolvePromiseSoon(RefPtr<ArrayBuffer>&& arrayBuffer)
+    {
+        ASSERT(!m_createImageBitmapTimer.isActive());
+        m_arrayBufferToProcess = WTFMove(arrayBuffer);
+        m_createImageBitmapTimer.startOneShot(0_s);
+    }
+
+    void createImageBitmapAndResolvePromise()
+    {
+        auto destroyOnExit = makeScopeExit([this] {
+            delete this;
+        });
+
+        if (!m_arrayBufferToProcess) {
             m_promise.reject(InvalidStateError, "An error occured reading the Blob argument to createImageBitmap");
             return;
         }
 
-        ImageBitmap::createFromBuffer(arrayBuffer.releaseNonNull(), m_blob->type(), m_blob->size(), m_blobLoader.url(), WTFMove(m_options), WTFMove(m_rect), WTFMove(m_promise));
+        ImageBitmap::createFromBuffer(m_arrayBufferToProcess.releaseNonNull(), m_blob->type(), m_blob->size(), m_blobLoader.url(), WTFMove(m_options), WTFMove(m_rect), WTFMove(m_promise));
     }
 
@@ -600 +618 @@
     Optional<IntRect> m_rect;
     ImageBitmap::Promise m_promise;
+    SuspendableTimer m_createImageBitmapTimer;
+    RefPtr<ArrayBuffer> m_arrayBufferToProcess;
 };