Title: [247990] branches/safari-608-branch/Source/WebKit
- Revision
- 247990
- Author
- alanc...@apple.com
- Date
- 2019-07-29 20:56:21 -0700 (Mon, 29 Jul 2019)
Log Message
Cherry-pick r247853. rdar://problem/53648225
Unreviewed, build fix after r247851
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
Reverts an unnecessary change.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (247989 => 247990)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-07-30 03:56:19 UTC (rev 247989)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-07-30 03:56:21 UTC (rev 247990)
@@ -1,5 +1,25 @@
2019-07-29 Alan Coon <alanc...@apple.com>
+ Cherry-pick r247853. rdar://problem/53648225
+
+ Unreviewed, build fix after r247851
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ Reverts an unnecessary change.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-25 Jiewen Tan <jiewen_...@apple.com>
+
+ Unreviewed, build fix after r247851
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ Reverts an unnecessary change.
+
+2019-07-29 Alan Coon <alanc...@apple.com>
+
Cherry-pick r247851. rdar://problem/53648225
WebPageProxy::receivedPolicyDecision should check navigation ID before clear pendingAPIRequest
Modified: branches/safari-608-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (247989 => 247990)
--- branches/safari-608-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-07-30 03:56:19 UTC (rev 247989)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-07-30 03:56:21 UTC (rev 247990)
@@ -4630,7 +4630,7 @@
auto transaction = m_pageLoadState.transaction();
- bool fromAPI = navigationID == m_pageLoadState.pendingAPIRequest().navigationID;
+ bool fromAPI = request.url() == m_pageLoadState.pendingAPIRequestURL();
if (!fromAPI)
m_pageLoadState.clearPendingAPIRequest(transaction);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
