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

Unified Diff: third_party/WebKit/Source/core/frame/History.cpp

Issue 2487403002: Allow navigations to frames that aren't being unloaded in the unload handler. (Closed)
Patch Set: Created 4 years, 1 month 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
Index: third_party/WebKit/Source/core/frame/History.cpp
diff --git a/third_party/WebKit/Source/core/frame/History.cpp b/third_party/WebKit/Source/core/frame/History.cpp
index ff278e4d8c74cc3ff2685cc5e9a663d3f5dd44c4..990e14fa8958c62e1e331334241492accc0aded7 100644
--- a/third_party/WebKit/Source/core/frame/History.cpp
+++ b/third_party/WebKit/Source/core/frame/History.cpp
@@ -139,9 +139,8 @@ void History::go(ExecutionContext* context, int delta) {
return;
if (!activeDocument->frame() ||
- !activeDocument->frame()->canNavigate(*frame()))
- return;
- if (!NavigationDisablerForUnload::isNavigationAllowed())
+ !activeDocument->frame()->canNavigate(*frame()) ||
+ !activeDocument->frame()->isNavigationAllowed())
lfg 2016/11/10 00:15:04 We should probably merge these two functions, but
return;
// We intentionally call reload() for the current frame if delta is zero.

Powered by Google App Engine
This is Rietveld 408576698