Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2600653002: PlzNavigate: cancel any scheduled navigations when deciding to let the embedder handle a navigation. (Closed)
Patch Set: . Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 68831e29a0776cb5956f332bd655788707103e60..1f3658cab701eebe0699a55bc6da19fad8cdb34a 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1635,6 +1635,8 @@ bool FrameLoader::shouldContinueForNavigationPolicy(
// Mark the frame as loading since the embedder is handling the navigation.
m_progressTracker->progressStarted();
+ m_frame->navigationScheduler().cancel();
+
// If this is a form submit, dispatch that a form is being submitted
// since the embedder is handling the navigation.
if (form)
« no previous file with comments | « third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698