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

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

Issue 1459473003: Add a WebContents getter callback in ResourceRequestInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/loader/global_routing_id.h" 8 #include "content/browser/loader/global_routing_id.h"
8 #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"
9 #include "content/common/net/url_request_user_data.h" 11 #include "content/common/net/url_request_user_data.h"
12 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/global_request_id.h" 13 #include "content/public/browser/global_request_id.h"
11 #include "content/public/common/process_type.h" 14 #include "content/public/common/process_type.h"
12 #include "net/url_request/url_request.h" 15 #include "net/url_request/url_request.h"
13 16
14 namespace content { 17 namespace content {
15 18
19 namespace {
20
21 WebContents* GetWebContentsFromFTNID(int frame_tree_node_id) {
22 DCHECK_CURRENTLY_ON(BrowserThread::UI);
23 FrameTreeNode* frame_tree_node =
24 FrameTreeNode::GloballyFindByID(frame_tree_node_id);
25 if (!frame_tree_node)
26 return nullptr;
27
28 return WebContentsImpl::FromFrameTreeNode(frame_tree_node);
29 }
30
31 WebContents* GetWebContentsFromRFHID(int render_process_id,
32 int render_frame_id) {
33 DCHECK_CURRENTLY_ON(BrowserThread::UI);
34 RenderFrameHost* render_frame_host =
35 RenderFrameHost::FromID(render_process_id, render_frame_id);
36 if (!render_frame_host)
37 return nullptr;
38
39 return WebContents::FromRenderFrameHost(render_frame_host);
40 }
41
42 } // namespace
43
16 // ---------------------------------------------------------------------------- 44 // ----------------------------------------------------------------------------
17 // ResourceRequestInfo 45 // ResourceRequestInfo
18 46
19 // static 47 // static
20 const ResourceRequestInfo* ResourceRequestInfo::ForRequest( 48 const ResourceRequestInfo* ResourceRequestInfo::ForRequest(
21 const net::URLRequest* request) { 49 const net::URLRequest* request) {
22 return ResourceRequestInfoImpl::ForRequest(request); 50 return ResourceRequestInfoImpl::ForRequest(request);
23 } 51 }
24 52
25 // static 53 // static
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 context_(context), 189 context_(context),
162 filter_(filter), 190 filter_(filter),
163 report_raw_headers_(report_raw_headers), 191 report_raw_headers_(report_raw_headers),
164 is_async_(is_async), 192 is_async_(is_async),
165 is_using_lofi_(is_using_lofi) { 193 is_using_lofi_(is_using_lofi) {
166 } 194 }
167 195
168 ResourceRequestInfoImpl::~ResourceRequestInfoImpl() { 196 ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
169 } 197 }
170 198
199 ResourceRequestInfo::WebContentsGetterOnUI
200 ResourceRequestInfoImpl::GetWebContentsForRequest() {
davidben 2015/11/19 17:46:13 This probably wants to comment to explain why ther
clamy 2015/11/20 13:50:42 Done.
201 if (frame_tree_node_id_ != -1)
202 return base::Bind(&GetWebContentsFromFTNID, frame_tree_node_id_);
203
204 int render_process_host_id = -1;
205 int render_frame_host_id = -1;
206 if (!GetAssociatedRenderFrame(&render_process_host_id, &render_frame_host_id))
207 NOTREACHED();
208
209 return base::Bind(&GetWebContentsFromRFHID, render_process_host_id,
210 render_frame_host_id);
211 }
212
171 ResourceContext* ResourceRequestInfoImpl::GetContext() const { 213 ResourceContext* ResourceRequestInfoImpl::GetContext() const {
172 return context_; 214 return context_;
173 } 215 }
174 216
175 int ResourceRequestInfoImpl::GetChildID() const { 217 int ResourceRequestInfoImpl::GetChildID() const {
176 return child_id_; 218 return child_id_;
177 } 219 }
178 220
179 int ResourceRequestInfoImpl::GetRouteID() const { 221 int ResourceRequestInfoImpl::GetRouteID() const {
180 return route_id_; 222 return route_id_;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 base::WeakPtr<ResourceMessageFilter> filter) { 332 base::WeakPtr<ResourceMessageFilter> filter) {
291 child_id_ = child_id; 333 child_id_ = child_id;
292 route_id_ = route_id; 334 route_id_ = route_id;
293 origin_pid_ = origin_pid; 335 origin_pid_ = origin_pid;
294 request_id_ = request_id; 336 request_id_ = request_id;
295 parent_render_frame_id_ = parent_render_frame_id; 337 parent_render_frame_id_ = parent_render_frame_id;
296 filter_ = filter; 338 filter_ = filter;
297 } 339 }
298 340
299 } // namespace content 341 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698