OLD | NEW |
---|---|
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/loader_globals.h" | |
9 #include "content/browser/loader/resource_message_filter.h" | 10 #include "content/browser/loader/resource_message_filter.h" |
10 #include "content/browser/web_contents/web_contents_impl.h" | 11 #include "content/browser/web_contents/web_contents_impl.h" |
11 #include "content/common/net/url_request_service_worker_data.h" | 12 #include "content/common/net/url_request_service_worker_data.h" |
12 #include "content/common/net/url_request_user_data.h" | 13 #include "content/common/net/url_request_user_data.h" |
13 #include "content/public/browser/browser_thread.h" | |
14 #include "content/public/browser/global_request_id.h" | 14 #include "content/public/browser/global_request_id.h" |
15 #include "content/public/common/browser_side_navigation_policy.h" | 15 #include "content/public/common/browser_side_navigation_policy.h" |
16 #include "content/public/common/process_type.h" | 16 #include "content/public/common/process_type.h" |
17 #include "net/url_request/url_request.h" | 17 #include "net/url_request/url_request.h" |
18 | 18 |
19 namespace content { | 19 namespace content { |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 WebContents* GetWebContentsFromFTNID(int frame_tree_node_id) { | 23 WebContents* GetWebContentsFromFTNID(int frame_tree_node_id) { |
24 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 24 DCHECK(LoaderGlobals::Get() |
jam
2017/03/29 15:44:33
seems like any code that calls WebContents is by d
ananta
2017/03/29 19:41:04
This function needs to be moved. We can revisit. R
| |
25 ->main_thread_task_runner() | |
26 ->BelongsToCurrentThread()); | |
25 FrameTreeNode* frame_tree_node = | 27 FrameTreeNode* frame_tree_node = |
26 FrameTreeNode::GloballyFindByID(frame_tree_node_id); | 28 FrameTreeNode::GloballyFindByID(frame_tree_node_id); |
27 if (!frame_tree_node) | 29 if (!frame_tree_node) |
28 return nullptr; | 30 return nullptr; |
29 | 31 |
30 return WebContentsImpl::FromFrameTreeNode(frame_tree_node); | 32 return WebContentsImpl::FromFrameTreeNode(frame_tree_node); |
31 } | 33 } |
32 | 34 |
33 } // namespace | 35 } // namespace |
34 | 36 |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
344 on_transfer_.Run(std::move(url_loader_request), | 346 on_transfer_.Run(std::move(url_loader_request), |
345 std::move(url_loader_client)); | 347 std::move(url_loader_client)); |
346 } | 348 } |
347 } | 349 } |
348 | 350 |
349 void ResourceRequestInfoImpl::ResetBody() { | 351 void ResourceRequestInfoImpl::ResetBody() { |
350 body_ = nullptr; | 352 body_ = nullptr; |
351 } | 353 } |
352 | 354 |
353 } // namespace content | 355 } // namespace content |
OLD | NEW |