Title: [249142] trunk/Source/WebKit
- Revision
- 249142
- Author
- [email protected]
- Date
- 2019-08-27 09:08:48 -0700 (Tue, 27 Aug 2019)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (249141 => 249142)
--- trunk/Source/WebKit/ChangeLog 2019-08-27 15:23:46 UTC (rev 249141)
+++ trunk/Source/WebKit/ChangeLog 2019-08-27 16:08:48 UTC (rev 249142)
@@ -1,3 +1,16 @@
+2019-08-27 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
[CoordGraphics] Delay LayerTreeHost creation in always-on AC until DrawingArea painting is enabled
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (249141 => 249142)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-08-27 15:23:46 UTC (rev 249141)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-08-27 16:08:48 UTC (rev 249142)
@@ -4009,7 +4009,8 @@
auto transaction = m_pageLoadState.transaction();
- m_pageLoadState.clearPendingAPIRequest(transaction);
+ if (navigation)
+ m_pageLoadState.clearPendingAPIRequest(transaction);
if (frame->isMainFrame()) {
process->didStartProvisionalLoadForMainFrame(url);
@@ -4657,7 +4658,7 @@
auto transaction = m_pageLoadState.transaction();
bool fromAPI = request.url() == m_pageLoadState.pendingAPIRequestURL();
- if (!fromAPI)
+ if (navigationID && !fromAPI)
m_pageLoadState.clearPendingAPIRequest(transaction);
if (!checkURLReceivedFromCurrentOrPreviousWebProcess(process, request.url())) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
