content/browser/loader/resource_dispatcher_host_impl.cc - Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Nasko's nits (#30) 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/loader/resource_dispatcher_host_unittest.cc » ('j') | content/public/browser/render_frame_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c68198438ff841e7cfc0d743b8dd0ca27cde06a9..44ce0e9c6b651dd35c446105c7d4304e8be40170 100644

--- a/content/browser/loader/resource_dispatcher_host_impl.cc

+++ b/content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1115,8 +1115,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.

@@ -1341,7 +1340,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,

@@ -1628,7 +1626,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

@@ -2067,7 +2064,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.