Title: [229071] trunk/Source/WebCore
- Revision
- 229071
- Author
- [email protected]
- Date
- 2018-02-27 13:47:57 -0800 (Tue, 27 Feb 2018)
Log Message
Unreviewed, roll out r228430.
Roll out r228430 now that it is no longer needed after r228852.
No new tests, initial fix is still covered by WebKit.RespondToPolicyForNavigationResponseAsynchronously
API test.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopLoading):
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::schedule):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229070 => 229071)
--- trunk/Source/WebCore/ChangeLog 2018-02-27 21:08:50 UTC (rev 229070)
+++ trunk/Source/WebCore/ChangeLog 2018-02-27 21:47:57 UTC (rev 229071)
@@ -1,3 +1,17 @@
+2018-02-27 Chris Dumez <[email protected]>
+
+ Unreviewed, roll out r228430.
+
+ Roll out r228430 now that it is no longer needed after r228852.
+
+ No new tests, initial fix is still covered by WebKit.RespondToPolicyForNavigationResponseAsynchronously
+ API test.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopLoading):
+ * loader/NavigationScheduler.cpp:
+ (WebCore::NavigationScheduler::schedule):
+
2018-02-27 Antoine Quint <[email protected]>
[Web Animations] Correct implementation of pending tasks and promises
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (229070 => 229071)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2018-02-27 21:08:50 UTC (rev 229070)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2018-02-27 21:47:57 UTC (rev 229071)
@@ -488,6 +488,8 @@
DatabaseManager::singleton().stopDatabases(*document, nullptr);
}
+ policyChecker().stopCheck();
+
// FIXME: This will cancel redirection timer, which really needs to be restarted when restoring the frame from b/f cache.
m_frame.navigationScheduler().cancel();
}
Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (229070 => 229071)
--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2018-02-27 21:08:50 UTC (rev 229070)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2018-02-27 21:47:57 UTC (rev 229071)
@@ -521,7 +521,6 @@
if (redirect->wasDuringLoad()) {
if (DocumentLoader* provisionalDocumentLoader = m_frame.loader().provisionalDocumentLoader())
provisionalDocumentLoader->stopLoading();
- m_frame.loader().policyChecker().stopCheck();
m_frame.loader().stopLoading(UnloadEventPolicyUnloadAndPageHide);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
