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

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: addressing comments Created 3 years, 11 months 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 d6f76e68d4dfdabdded50b82bdfa00d8c79585fa..6e951be2952fecce123c92b3cdda74b313f592b8 100644
--- a/third_party/WebKit/Source/core/frame/History.cpp
+++ b/third_party/WebKit/Source/core/frame/History.cpp
@@ -139,11 +139,11 @@ void History::go(ExecutionContext* context, int delta) {
return;
if (!activeDocument->frame() ||
- !activeDocument->frame()->canNavigate(*frame())) {
+ !activeDocument->frame()->canNavigate(*frame()) ||
+ !activeDocument->frame()->isNavigationAllowed() ||
+ !NavigationDisablerForBeforeUnload::isNavigationAllowed()) {
return;
}
- if (!NavigationDisablerForUnload::isNavigationAllowed())
- return;
if (delta) {
frame()->loader().client()->navigateBackForward(delta);

Powered by Google App Engine
This is Rietveld 408576698