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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 1440933004: Don't use didStopLoading in failed navigation when other nav in progress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move OnFailedLoadHelper to TestAwContentsClient. Created 5 years 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 2c84b0d65a9e036b1930a676de24699d396ab9b7..78fd7d1e69c41a5a4fbfb6150ef29e9122ff780f 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -219,7 +219,8 @@ void DocumentLoader::mainReceivedError(const ResourceError& error)
if (!frameLoader())
return;
m_mainDocumentError = error;
- m_state = MainResourceDone;
+ if (m_state < MainResourceDone)
+ m_state = MainResourceDone;
frameLoader()->receivedMainResourceError(this, error);
clearMainResourceHandle();
}
« no previous file with comments | « content/browser/web_contents/web_contents_impl_browsertest.cc ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698