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

Side by Side Diff: content/browser/loader/resource_request_info_impl.cc

Issue 1542743002: [RDHI] Refactored blocked_loaders_map_ to key by render frame route id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/resource_request_info_impl.h" 5 #include "content/browser/loader/resource_request_info_impl.h"
6 6
7 #include "content/browser/frame_host/frame_tree_node.h" 7 #include "content/browser/frame_host/frame_tree_node.h"
8 #include "content/browser/loader/global_routing_id.h" 8 #include "content/browser/loader/global_routing_id.h"
9 #include "content/browser/loader/resource_message_filter.h" 9 #include "content/browser/loader/resource_message_filter.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const { 324 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const {
325 return GlobalRoutingID(child_id_, route_id_); 325 return GlobalRoutingID(child_id_, route_id_);
326 } 326 }
327 327
328 void ResourceRequestInfoImpl::UpdateForTransfer( 328 void ResourceRequestInfoImpl::UpdateForTransfer(
329 int child_id, 329 int child_id,
330 int route_id, 330 int route_id,
331 int origin_pid, 331 int origin_pid,
332 int request_id, 332 int request_id,
333 int render_frame_id,
333 int parent_render_frame_id, 334 int parent_render_frame_id,
334 base::WeakPtr<ResourceMessageFilter> filter) { 335 base::WeakPtr<ResourceMessageFilter> filter) {
335 child_id_ = child_id; 336 child_id_ = child_id;
336 route_id_ = route_id; 337 route_id_ = route_id;
337 origin_pid_ = origin_pid; 338 origin_pid_ = origin_pid;
338 request_id_ = request_id; 339 request_id_ = request_id;
340 render_frame_id_ = render_frame_id;
nasko 2016/01/07 19:58:39 It looks like the changes in this file can be spli
Charlie Harrison 2016/01/07 22:47:05 Yep it can. I'll do that.
339 parent_render_frame_id_ = parent_render_frame_id; 341 parent_render_frame_id_ = parent_render_frame_id;
340 filter_ = filter; 342 filter_ = filter;
341 } 343 }
342 344
343 } // namespace content 345 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698