third_party/WebKit/Source/core/loader/DocumentLoader.cpp - Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation.

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: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase (simple conflict in AwContentsClientShouldOverrideUrlLoadingTest). Created 4 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/loader/DocumentLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

index 87826d60a1f3c95216423d645ce400e44fcbbbbd..bdbd77a23bb535fd226573d98f45d696b01f7462 100644

--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

@@ -231,8 +231,7 @@ void DocumentLoader::mainReceivedError(const ResourceError& error)

m_applicationCacheHost->failedLoadingMainResource();

if (!frameLoader())

return;

- if (m_state < MainResourceDone)

- m_state = MainResourceDone;

+ m_state = MainResourceDone;

frameLoader()->receivedMainResourceError(this, error);

clearMainResourceHandle();

}

« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »