Title: [262845] trunk
- Revision
- 262845
- Author
- [email protected]
- Date
- 2020-06-10 10:59:49 -0700 (Wed, 10 Jun 2020)
Log Message
Revert r259770
https://bugs.webkit.org/show_bug.cgi?id=210097
<rdar://problem/64175992>
Source/WebKit:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
Tools:
* TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
(TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262844 => 262845)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 17:42:26 UTC (rev 262844)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 17:59:49 UTC (rev 262845)
@@ -1,5 +1,14 @@
2020-06-10 Alex Christensen <[email protected]>
+ Revert r259770
+ https://bugs.webkit.org/show_bug.cgi?id=210097
+ <rdar://problem/64175992>
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+
+2020-06-10 Alex Christensen <[email protected]>
+
Add some null checks in PDFPlugin::updatePageAndDeviceScaleFactors
https://bugs.webkit.org/show_bug.cgi?id=213009
<rdar://problem/63756100>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (262844 => 262845)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-10 17:42:26 UTC (rev 262844)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-10 17:59:49 UTC (rev 262845)
@@ -5231,7 +5231,7 @@
}, [&] (ContinueUnsafeLoad continueUnsafeLoad) {
switch (continueUnsafeLoad) {
case ContinueUnsafeLoad::No:
- if (!hasCommittedAnyProvisionalLoads() && !m_sessionStateWasRestoredByAPIRequest)
+ if (!hasCommittedAnyProvisionalLoads())
m_uiClient->close(protectedThis.ptr());
completionHandler(PolicyAction::Ignore);
break;
Modified: trunk/Tools/ChangeLog (262844 => 262845)
--- trunk/Tools/ChangeLog 2020-06-10 17:42:26 UTC (rev 262844)
+++ trunk/Tools/ChangeLog 2020-06-10 17:59:49 UTC (rev 262845)
@@ -1,3 +1,12 @@
+2020-06-10 Alex Christensen <[email protected]>
+
+ Revert r259770
+ https://bugs.webkit.org/show_bug.cgi?id=210097
+ <rdar://problem/64175992>
+
+ * TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:
+ (TEST):
+
2020-06-10 Commit Queue <[email protected]>
Unreviewed, reverting r262807.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm (262844 => 262845)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm 2020-06-10 17:42:26 UTC (rev 262844)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm 2020-06-10 17:59:49 UTC (rev 262845)
@@ -263,7 +263,7 @@
#endif
EXPECT_FALSE(didCloseCalled);
goBack([webView2 _safeBrowsingWarning]);
- EXPECT_FALSE(didCloseCalled);
+ EXPECT_TRUE(didCloseCalled);
WKBackForwardList *list = [webView2 backForwardList];
EXPECT_FALSE(!!list.backItem);
EXPECT_FALSE(!!list.forwardItem);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
