content/browser/web_contents/web_contents_impl.cc - Issue 789643005: PlzNavigate: make content unit tests work with browser side navigation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 789643005: PlzNavigate: make content unit tests work with browser side navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cancel-navigations

Patch Set: Now addressing failures due to speculative RFH Created 5 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

« content/browser/frame_host/render_frame_host_manager_unittest.cc ('K') | « content/browser/frame_host/render_frame_host_manager_unittest.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 5b891f5487de5e086e1618da88c14d677e59a059..9462007e24aa7c71fbe22b47bd893022b68e5c79 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -4021,7 +4021,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {

if (DevToolsAgentHost::IsDebuggerAttached(this))

return;

- if (rfhi->is_waiting_for_beforeunload_ack() ||

+ if (rfhi->IsWaitingForBeforeUnloadACK() ||

rfhi->IsWaitingForUnloadACK()) {

// Hang occurred while firing the beforeunload/unload handler.

// Pretend the handler fired so tab closing continues as if it had.

@@ -4037,7 +4037,7 @@ void WebContentsImpl::RendererUnresponsive(RenderViewHost* render_view_host) {

// close. Otherwise, pretend the unload listeners have all fired and close

// the tab.

bool close = true;

- if (rfhi->is_waiting_for_beforeunload_ack() && delegate_) {

+ if (rfhi->IsWaitingForBeforeUnloadACK() && delegate_) {

delegate_->BeforeUnloadFired(this, true, &close);

}

if (close)