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

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments #47 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: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index bffd3d6f4f93af729c7da4a72ca24fc02e6a0fb9..830f2e369d105cd8745d4070d7a5c07290de862d 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1178,8 +1178,7 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer(
// ResourceRequestInfo rather than caching it locally. This lets us update
// the info object when a transfer occurs.
info->UpdateForTransfer(child_id, route_id, request_data.origin_pid,
- request_id, request_data.parent_render_frame_id,
- filter_->GetWeakPtr());
+ request_id, filter_->GetWeakPtr());
// Update maps that used the old IDs, if necessary. Some transfers in tests
// do not actually use a different ID, so not all maps need to be updated.
@@ -1410,7 +1409,6 @@ void ResourceDispatcherHostImpl::BeginRequest(
request_data.render_frame_id,
request_data.is_main_frame,
request_data.parent_is_main_frame,
- request_data.parent_render_frame_id,
request_data.resource_type,
request_data.transition_type,
request_data.should_replace_current_entry,
@@ -1707,7 +1705,6 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
render_frame_route_id,
false, // is_main_frame
false, // parent_is_main_frame
- -1, // parent_render_frame_id
RESOURCE_TYPE_SUB_RESOURCE,
ui::PAGE_TRANSITION_LINK,
false, // should_replace_current_entry
@@ -2147,7 +2144,6 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
request_id_,
-1, // request_data.render_frame_id,
info.is_main_frame, info.parent_is_main_frame,
- -1, // request_data.parent_render_frame_id,
resource_type, info.common_params.transition,
// should_replace_current_entry. This was only maintained at layer for
// request transfers and isn't needed for browser-side navigations.

Powered by Google App Engine
This is Rietveld 408576698