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

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

Issue 2973433003: Block redirects to renderer-debug urls. (Closed)
Patch Set: Nit: Charlie Harrison Created 3 years, 5 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/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index 9e6c1fc1bd3e8a03ad3babb122673881e34a2ad4..1af4f4b08fd9f41a1120dd5e16500581b109d750 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -124,7 +124,6 @@ NavigationHandleImpl::NavigationHandleImpl(
is_form_submission_(is_form_submission),
expected_render_process_host_id_(ChildProcessHost::kInvalidUniqueID),
weak_factory_(this) {
- is_in_constructor = true;
TRACE_EVENT_ASYNC_BEGIN2("navigation", "NavigationHandle", this,
"frame_tree_node",
frame_tree_node_->frame_tree_node_id(), "url",
@@ -178,15 +177,9 @@ NavigationHandleImpl::NavigationHandleImpl(
TRACE_EVENT_ASYNC_STEP_INTO0("navigation", "NavigationHandle", this,
"Same document");
}
- is_in_constructor = false;
}
NavigationHandleImpl::~NavigationHandleImpl() {
- // TODO(arthursonzogni): Remove this when we understand the root cause behind
- // crbug.com/704892.
- if (is_in_constructor)
- base::debug::DumpWithoutCrashing();
-
// Inform the RenderProcessHost to no longer expect a navigation.
if (expected_render_process_host_id_ != ChildProcessHost::kInvalidUniqueID) {
RenderProcessHost* process =
@@ -630,8 +623,11 @@ void NavigationHandleImpl::WillRedirectRequest(
"WillRedirectRequest", "url",
new_url.possibly_invalid_spec());
- // TODO(arthursonzogni): Remove this when we understand the root cause behind
- // crbug.com/704892 and crbug.com/736658
+ // |new_url| is not expected to be a "renderer debug" url. It should be
+ // blocked in NavigationRequest::OnRequestRedirected or in
+ // ResourceLoader::OnReceivedRedirect. If it is not the case,
+ // DidFinishNavigation will not be called. It could confuse some
+ // WebContentsObserver because DidStartNavigation was called.
if (IsRendererDebugURL(new_url))
base::debug::DumpWithoutCrashing();
Charlie Reis 2017/07/07 17:12:59 We shouldn't leave DumpWithoutCrashing calls in th
arthursonzogni 2017/07/10 16:07:04 Done.

Powered by Google App Engine
This is Rietveld 408576698