Changeset 249142 in webkit

Timestamp:

Aug 27, 2019 9:08:48 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Do not clear the pending api request when there's no navigation ID
​https://bugs.webkit.org/show_bug.cgi?id=201175

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-08-27
Reviewed by Chris Dumez.

After r247851, the pending API request URL is cleared for subresources in some cases.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Do not clear the pending api request when there's no navigation ID
+        https://bugs.webkit.org/show_bug.cgi?id=201175
+
+        Reviewed by Chris Dumez.
+
+        After r247851, the pending API request URL is cleared for subresources in some cases.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
+        (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+
 2019-08-27  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -4010 +4010 @@
     auto transaction = m_pageLoadState.transaction();
 
-    m_pageLoadState.clearPendingAPIRequest(transaction);
+    if (navigation)
+        m_pageLoadState.clearPendingAPIRequest(transaction);
 
     if (frame->isMainFrame()) {
@@ -4658 +4659 @@
 
     bool fromAPI = request.url() == m_pageLoadState.pendingAPIRequestURL();
-    if (!fromAPI)
+    if (navigationID && !fromAPI)
         m_pageLoadState.clearPendingAPIRequest(transaction);