Unreviewed, roll out r228430.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Feb 2018 21:47:57 +0000 (21:47 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Feb 2018 21:47:57 +0000 (21:47 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229071 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/NavigationScheduler.cpp

index b29a9ae..cbf682b 100644 (file)
@@ -1,3 +1,17 @@
+2018-02-27  Chris Dumez  <cdumez@apple.com>
+
+        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  <graouts@apple.com>
 
         [Web Animations] Correct implementation of pending tasks and promises
index 206f6cb..ce6ac6b 100644 (file)
@@ -488,6 +488,8 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy)
         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();
 }
index caf2704..46d59d1 100644 (file)
@@ -521,7 +521,6 @@ void NavigationScheduler::schedule(std::unique_ptr<ScheduledNavigation> redirect
     if (redirect->wasDuringLoad()) {
         if (DocumentLoader* provisionalDocumentLoader = m_frame.loader().provisionalDocumentLoader())
             provisionalDocumentLoader->stopLoading();
-        m_frame.loader().policyChecker().stopCheck();
         m_frame.loader().stopLoading(UnloadEventPolicyUnloadAndPageHide);
     }