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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2439903003: PlzNavigate: Allow frames to fallback to alternative content. (Closed)
Patch Set: Nit. Created 4 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation » ('j') | 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 06eba94a764b63205987137d32bc4b980f61c73a..55d522013aaf9d479329306f5d621ae39a92f2a4 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5071,6 +5071,14 @@ void RenderFrameImpl::OnFailedNavigation(
return;
}
+ // On load failure, a frame can ask its owner to render fallback content.
+ // If it is possible, there is no more need to load an error page since it
clamy 2016/11/04 14:47:12 Nit: Rewrite the second sentence as "When that hap
arthursonzogni 2016/11/07 09:59:06 Done.
+ // will not be displayed.
+ if (frame_->maybeRenderFallbackContent(error)) {
+ browser_side_navigation_pending_ = false;
clamy 2016/11/04 14:47:11 Will maybeRenderFallbackContent eventually lead to
arthursonzogni 2016/11/07 09:59:06 Yes it is. The list of calls is: * WebLocalFrameI
+ return;
+ }
+
// Make sure errors are not shown in view source mode.
frame_->enableViewSourceMode(false);
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698