Changeset 234684 in webkit

Timestamp:

Aug 7, 2018 6:41:45 PM (6 years ago)

Author:

Chris Dumez

Message:

navigator.sendBeacon does not work in pagehide callbacks
​https://bugs.webkit.org/show_bug.cgi?id=188329

Reviewed by Alex Christensen.

Source/WebCore:

Add support for sending beacons from pagehide event handlers. We normally do not allow loads because we're
about to enter PageCache. However, in case of Beacon, this is fine since it uses PingLoad and does not
WebCore to do the load.

Test: http/wpt/beacon/sendBeacon-in-pagehide.html

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::load):

• Allow Beacon loads to go through even if the document's pageCacheState is AboutToEnterPageCache (i.e.

we're firing the 'pagehide' event)

• Allow Becon loads to go though even if the FrameLoader's state is provisional (i.e. a load is pending)

LayoutTests:

Add layout test coverage.

• http/wpt/beacon/sendBeacon-in-pagehide-expected.txt: Added.
• http/wpt/beacon/sendBeacon-in-pagehide.html: Added.
• http/wpt/beacon/support/sendBeacon-onpagehide-window.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/beacon/sendBeacon-in-pagehide-expected.txt (added)
• LayoutTests/http/wpt/beacon/sendBeacon-in-pagehide.html (added)
• LayoutTests/http/wpt/beacon/support/sendBeacon-onpagehide-window.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-07  Chris Dumez  <cdumez@apple.com>
+
+        navigator.sendBeacon does not work in pagehide callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=188329
+
+        Reviewed by Alex Christensen.
+
+        Add layout test coverage.
+
+        * http/wpt/beacon/sendBeacon-in-pagehide-expected.txt: Added.
+        * http/wpt/beacon/sendBeacon-in-pagehide.html: Added.
+        * http/wpt/beacon/support/sendBeacon-onpagehide-window.html: Added.
+
 2018-08-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-07  Chris Dumez  <cdumez@apple.com>
+
+        navigator.sendBeacon does not work in pagehide callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=188329
+
+        Reviewed by Alex Christensen.
+
+        Add support for sending beacons from pagehide event handlers. We normally do not allow loads because we're
+        about to enter PageCache. However, in case of Beacon, this is fine since it uses PingLoad and does not
+        WebCore to do the load.
+
+        Test: http/wpt/beacon/sendBeacon-in-pagehide.html
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        - Allow Beacon loads to go through even if the document's pageCacheState is AboutToEnterPageCache (i.e.
+        we're firing the 'pagehide' event)
+        - Allow Becon loads to go though even if the FrameLoader's state is provisional (i.e. a load is pending)
+
 2018-08-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -202 +202 @@
     // cache.
     if (auto* topDocument = frame.mainFrame().document()) {
-        if (topDocument->pageCacheState() != Document::NotInPageCache) {
+        switch (topDocument->pageCacheState()) {
+        case Document::NotInPageCache:
+            break;
+        case Document::AboutToEnterPageCache:
+            // Beacons are allowed to go through in 'pagehide' event handlers.
+            if (shouldUsePingLoad(type()))
+                break;
+            FALLTHROUGH;
+        case Document::InPageCache:
             RELEASE_LOG_IF_ALLOWED("load: Already in page cache or being added to it (frame = %p)", &frame);
             failBeforeStarting();
@@ -210 +218 @@
 
     FrameLoader& frameLoader = frame.loader();
-    if (m_options.securityCheck == SecurityCheckPolicy::DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
+    if (m_options.securityCheck == SecurityCheckPolicy::DoSecurityCheck && !shouldUsePingLoad(type()) && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
         if (frameLoader.state() == FrameStateProvisional)
             RELEASE_LOG_IF_ALLOWED("load: Failed security check -- state is provisional (frame = %p)", &frame);