Index: third_party/WebKit/Source/core/dom/Document.cpp |
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp |
index 43482a85797474481f9e2cccc4cb3732c79ab7c2..5d7199ce0f08458e29abf0784c96b3113f93cfe7 100644 |
--- a/third_party/WebKit/Source/core/dom/Document.cpp |
+++ b/third_party/WebKit/Source/core/dom/Document.cpp |
@@ -2661,8 +2661,12 @@ void Document::open() { |
} |
} |
- if (m_frame->loader().provisionalDocumentLoader()) |
+ // PlzNavigate: We should abort ongoing navigations handled by the client. |
+ if (m_frame->loader().provisionalDocumentLoader() || |
+ (m_frame->settings()->getBrowserSideNavigationEnabled() && |
+ m_frame->loader().navigationHandledByClient())) { |
Nate Chapin
2017/01/12 19:59:26
Do you have any sense how many other callers of pr
ananta
2017/01/12 20:36:55
Added the function and called it from here and fro
|
m_frame->loader().stopAllLoaders(); |
+ } |
} |
removeAllEventListenersRecursively(); |