Changeset 248148 in webkit

Timestamp:

Aug 1, 2019 10:46:32 PM (5 years ago)

Author:

Chris Dumez

Message:

Pages using MessagePorts should be PageCacheable
​https://bugs.webkit.org/show_bug.cgi?id=200366
<rdar://problem/53837882>

Reviewed by Geoffrey Garen.

Source/WebCore:

Allow a page to enter PageCache, even if it has MessagePorts (potentially with
pending messages). If there are pending messages on the MessagePorts when
entering PageCache, those will get dispatched upon restoring from PageCache.

Test: fast/history/page-cache-MessagePort-pending-message.html

• dom/MessagePort.cpp:

(WebCore::MessagePort::messageAvailable):
(WebCore::MessagePort::dispatchMessages):
Do not dispatch messages while in PageCache.

(WebCore::MessagePort::canSuspendForDocumentSuspension const):
Allow pages with MessagePort objects to enter PageCache.

• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
Make sure pending messages on MessagePorts get dispatched asynchronously after restoring
from PageCache.

• loader/DocumentLoader.cpp:

(WebCore::areAllLoadersPageCacheAcceptable):
Make sure only CachedResources that are still loading upon load cancelation prevent
entering PageCache.

LayoutTests:

Add layout test coverage.

• fast/history/page-cache-MessagePort-pending-message-expected.txt: Added.
• fast/history/page-cache-MessagePort-pending-message.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/history/page-cache-MessagePort-pending-message-expected.txt (added)
• LayoutTests/fast/history/page-cache-MessagePort-pending-message.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/MessagePort.cpp (modified) (3 diffs)
• Source/WebCore/dom/ScriptExecutionContext.cpp (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-01  Chris Dumez  <cdumez@apple.com>
+
+        Pages using MessagePorts should be PageCacheable
+        https://bugs.webkit.org/show_bug.cgi?id=200366
+        <rdar://problem/53837882>
+
+        Reviewed by Geoffrey Garen.
+
+        Add layout test coverage.
+
+        * fast/history/page-cache-MessagePort-pending-message-expected.txt: Added.
+        * fast/history/page-cache-MessagePort-pending-message.html: Added.
+
 2019-08-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-01  Chris Dumez  <cdumez@apple.com>
+
+        Pages using MessagePorts should be PageCacheable
+        https://bugs.webkit.org/show_bug.cgi?id=200366
+        <rdar://problem/53837882>
+
+        Reviewed by Geoffrey Garen.
+
+        Allow a page to enter PageCache, even if it has MessagePorts (potentially with
+        pending messages). If there are pending messages on the MessagePorts when
+        entering PageCache, those will get dispatched upon restoring from PageCache.
+
+        Test: fast/history/page-cache-MessagePort-pending-message.html
+
+        * dom/MessagePort.cpp:
+        (WebCore::MessagePort::messageAvailable):
+        (WebCore::MessagePort::dispatchMessages):
+        Do not dispatch messages while in PageCache.
+
+        (WebCore::MessagePort::canSuspendForDocumentSuspension const):
+        Allow pages with MessagePort objects to enter PageCache.
+
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
+        Make sure pending messages on MessagePorts get dispatched asynchronously after restoring
+        from PageCache.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::areAllLoadersPageCacheAcceptable):
+        Make sure only CachedResources that are still loading upon load cancelation prevent
+        entering PageCache.
+
 2019-08-01  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/WebCore/dom/MessagePort.cpp

@@ -196 +196 @@
     // This MessagePort object might be disentangled because the port is being transferred,
     // in which case we'll notify it that messages are available once a new end point is created.
-    if (!m_scriptExecutionContext)
+    if (!m_scriptExecutionContext || m_scriptExecutionContext->activeDOMObjectsAreSuspended())
         return;
 
@@ -244 +244 @@
     ASSERT(started());
 
-    if (!isEntangled())
+    if (!m_scriptExecutionContext || m_scriptExecutionContext->activeDOMObjectsAreSuspended() || !isEntangled())
         return;
 
@@ -431 +431 @@
 bool MessagePort::canSuspendForDocumentSuspension() const
 {
-    return !hasPendingActivity() || (!m_started || m_closed);
+    return true;
 }
 

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -308 +308 @@
         return ShouldContinue::Yes;
     });
+
+    // In case there were pending messages at the time the script execution context entered PageCache,
+    // make sure those get dispatched shortly after restoring from PageCache.
+    processMessageWithMessagePortsSoon();
 }
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -136 +136 @@
             return false;
 
-        // Only image and XHR loads do prevent the page from entering the PageCache.
+        // Only image and XHR loads do not prevent the page from entering the PageCache.
         // All non-image loads will prevent the page from entering the PageCache.
-        if (!cachedResource->isImage() && !cachedResource->areAllClientsXMLHttpRequests())
+        if (cachedResource->isLoading() && !cachedResource->isImage() && !cachedResource->areAllClientsXMLHttpRequests())
             return false;
     }