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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2248013003: PlzNavigate: Fix crash when loading unreachable URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments (2). Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index cb9e3d3faa5df2dc38de129057f07c3d243797bb..3caacd59e87fb6dbbf5ccf9a984bc134867d7eb3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4878,9 +4878,11 @@ void RenderFrameImpl::OnFailedNavigation(
frame_->isViewSourceModeEnabled());
SendFailedProvisionalLoad(failed_request, error, frame_);
- // This check should have been done on the browser side already.
if (!ShouldDisplayErrorPageForFailedLoad(error_code, common_params.url)) {
- NOTREACHED();
+ // The browser expects this frame to be loading an error page. Inform it
+ // that the load stopped.
+ if (!frame_->isLoading())
+ Send(new FrameHostMsg_DidStopLoading(routing_id_));
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698