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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 2687593002: PlzNavigate: Invoke didFailProvisionalLoad() in the renderer when a navigation request is cancelled… (Closed)
Patch Set: We may not have a provisional data source at all times Created 3 years, 10 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: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 0c34b760f629ae56c9c4c8fa0b69852949bee897..00cc0be64abf353a817b58c33e4a686f03c5084d 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -1023,16 +1023,19 @@ void NavigatorImpl::FailedNavigation(FrameTreeNode* frame_tree_node,
if (!IsRendererDebugURL(navigation_request->navigation_handle()->GetURL()))
DiscardPendingEntryIfNeeded(navigation_request->navigation_handle());
+ // Select an appropriate renderer to show the error page.
+ RenderFrameHostImpl* render_frame_host =
+ frame_tree_node->render_manager()->GetFrameHostForNavigation(
+ *navigation_request);
+
// If the request was canceled by the user do not show an error page.
if (error_code == net::ERR_ABORTED) {
+ render_frame_host->AbortNavigationRequest(
clamy 2017/02/08 17:13:34 How many tests fail without this? I'm not terribly
ananta 2017/02/08 23:02:19 Thanks. FrameLoader::stopAllLoaders() now sends fa
+ navigation_request->common_params().url, error_code);
frame_tree_node->ResetNavigationRequest(false);
return;
}
- // Select an appropriate renderer to show the error page.
- RenderFrameHostImpl* render_frame_host =
- frame_tree_node->render_manager()->GetFrameHostForNavigation(
- *navigation_request);
CheckWebUIRendererDoesNotDisplayNormalURL(
render_frame_host, navigation_request->common_params().url);
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698