third_party/WebKit/Source/core/loader/DocumentLoader.cpp - Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI.

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 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« content/renderer/npapi/webplugin_impl.cc ('K') | « third_party/WebKit/Source/core/loader/DocumentLoader.h ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 01b2985374a573954d9734b5cebfd7aaeac18ec3..3bf937c23dc1c8420d1f01a2711cef2019b84349 100644

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

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

@@ -217,7 +217,6 @@ void DocumentLoader::mainReceivedError(const ResourceError& error)

m_applicationCacheHost->failedLoadingMainResource();

if (!frameLoader())

return;

- m_mainDocumentError = error;

m_state = MainResourceDone;

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

clearMainResourceHandle();

@@ -722,7 +721,6 @@ bool DocumentLoader::maybeLoadEmpty()

void DocumentLoader::startLoadingMainResource()

{

RefPtrWillBeRawPtr<DocumentLoader> protect(this);

- m_mainDocumentError = ResourceError();

timing().markNavigationStart();

ASSERT(!m_mainResource);

ASSERT(m_state == NotStarted);