OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/navigation_url_loader_network_service.h" | 5 #include "content/browser/loader/navigation_url_loader_network_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/debug/stack_trace.h" | |
falken
2017/05/29 06:51:12
nit: rm this?
kinuko
2017/05/29 07:05:58
Oops, thanks, done.
| |
9 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
10 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
11 #include "content/browser/appcache/appcache_navigation_handle.h" | 12 #include "content/browser/appcache/appcache_navigation_handle.h" |
12 #include "content/browser/blob_storage/chrome_blob_storage_context.h" | 13 #include "content/browser/blob_storage/chrome_blob_storage_context.h" |
13 #include "content/browser/frame_host/frame_tree_node.h" | 14 #include "content/browser/frame_host/frame_tree_node.h" |
14 #include "content/browser/frame_host/navigation_request_info.h" | 15 #include "content/browser/frame_host/navigation_request_info.h" |
15 #include "content/browser/loader/navigation_resource_handler.h" | 16 #include "content/browser/loader/navigation_resource_handler.h" |
16 #include "content/browser/loader/navigation_resource_throttle.h" | 17 #include "content/browser/loader/navigation_resource_throttle.h" |
17 #include "content/browser/loader/navigation_url_loader_delegate.h" | 18 #include "content/browser/loader/navigation_url_loader_delegate.h" |
19 #include "content/browser/loader/url_loader_request_handler.h" | |
18 #include "content/browser/resource_context_impl.h" | 20 #include "content/browser/resource_context_impl.h" |
19 #include "content/browser/service_worker/service_worker_navigation_handle.h" | 21 #include "content/browser/service_worker/service_worker_navigation_handle.h" |
20 #include "content/browser/service_worker/service_worker_navigation_handle_core.h " | 22 #include "content/browser/service_worker/service_worker_navigation_handle_core.h " |
21 #include "content/browser/service_worker/service_worker_request_handler.h" | 23 #include "content/browser/service_worker/service_worker_request_handler.h" |
22 #include "content/browser/storage_partition_impl.h" | 24 #include "content/browser/storage_partition_impl.h" |
23 #include "content/browser/url_loader_factory_getter.h" | 25 #include "content/browser/url_loader_factory_getter.h" |
24 #include "content/browser/web_contents/web_contents_impl.h" | 26 #include "content/browser/web_contents/web_contents_impl.h" |
25 #include "content/browser/webui/url_data_manager_backend.h" | 27 #include "content/browser/webui/url_data_manager_backend.h" |
26 #include "content/browser/webui/web_ui_url_loader_factory.h" | 28 #include "content/browser/webui/web_ui_url_loader_factory.h" |
27 #include "content/public/browser/browser_context.h" | 29 #include "content/public/browser/browser_context.h" |
(...skipping 19 matching lines...) Expand all Loading... | |
47 WebContents* GetWebContentsFromFrameTreeNodeID(int frame_tree_node_id) { | 49 WebContents* GetWebContentsFromFrameTreeNodeID(int frame_tree_node_id) { |
48 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 50 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
49 FrameTreeNode* frame_tree_node = | 51 FrameTreeNode* frame_tree_node = |
50 FrameTreeNode::GloballyFindByID(frame_tree_node_id); | 52 FrameTreeNode::GloballyFindByID(frame_tree_node_id); |
51 if (!frame_tree_node) | 53 if (!frame_tree_node) |
52 return nullptr; | 54 return nullptr; |
53 | 55 |
54 return WebContentsImpl::FromFrameTreeNode(frame_tree_node); | 56 return WebContentsImpl::FromFrameTreeNode(frame_tree_node); |
55 } | 57 } |
56 | 58 |
57 void PrepareNavigationStartOnIO( | |
58 std::unique_ptr<ResourceRequest> resource_request, | |
59 ResourceContext* resource_context, | |
60 ServiceWorkerNavigationHandleCore* service_worker_navigation_handle_core, | |
61 AppCacheNavigationHandleCore* appcache_handle_core, | |
62 NavigationRequestInfo* request_info, | |
63 mojom::URLLoaderFactoryPtrInfo factory_from_ui, | |
64 scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter, | |
65 const base::Callback<WebContents*(void)>& web_contents_getter, | |
66 mojom::URLLoaderAssociatedRequest url_loader_request, | |
67 mojom::URLLoaderClientPtr url_loader_client_to_pass, | |
68 std::unique_ptr<service_manager::Connector> connector) { | |
69 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
70 | |
71 const ResourceType resource_type = request_info->is_main_frame | |
72 ? RESOURCE_TYPE_MAIN_FRAME | |
73 : RESOURCE_TYPE_SUB_FRAME; | |
74 | |
75 if (resource_request->request_body) { | |
76 AttachRequestBodyBlobDataHandles(resource_request->request_body.get(), | |
77 resource_context); | |
78 } | |
79 | |
80 mojom::URLLoaderFactoryPtr url_loader_factory_ptr; | |
81 if (service_worker_navigation_handle_core) { | |
82 RequestContextFrameType frame_type = | |
83 request_info->is_main_frame ? REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL | |
84 : REQUEST_CONTEXT_FRAME_TYPE_NESTED; | |
85 | |
86 storage::BlobStorageContext* blob_storage_context = GetBlobStorageContext( | |
87 GetChromeBlobStorageContextForResourceContext(resource_context)); | |
88 url_loader_factory_ptr = | |
89 ServiceWorkerRequestHandler::InitializeForNavigationNetworkService( | |
90 *resource_request, resource_context, | |
91 service_worker_navigation_handle_core, blob_storage_context, | |
92 request_info->begin_params.skip_service_worker, resource_type, | |
93 request_info->begin_params.request_context_type, frame_type, | |
94 request_info->are_ancestors_secure, | |
95 request_info->common_params.post_data, web_contents_getter); | |
96 } | |
97 | |
98 // If we haven't gotten one from the above, then use the one the UI thread | |
99 // gave us, or otherwise fallback to the default. | |
100 mojom::URLLoaderFactory* factory; | |
101 if (url_loader_factory_ptr) { | |
102 factory = url_loader_factory_ptr.get(); | |
103 } else { | |
104 if (factory_from_ui.is_valid()) { | |
105 url_loader_factory_ptr.Bind(std::move(factory_from_ui)); | |
106 factory = url_loader_factory_ptr.get(); | |
107 } else { | |
108 if (appcache_handle_core) { | |
109 factory = url_loader_factory_getter->GetAppCacheFactory()->get(); | |
110 } else { | |
111 factory = url_loader_factory_getter->GetNetworkFactory()->get(); | |
112 } | |
113 } | |
114 } | |
115 | |
116 factory->CreateLoaderAndStart( | |
117 std::move(url_loader_request), 0 /* routing_id? */, 0 /* request_id? */, | |
118 mojom::kURLLoadOptionSendSSLInfo, *resource_request, | |
119 std::move(url_loader_client_to_pass)); | |
120 } | |
121 | |
122 } // namespace | 59 } // namespace |
123 | 60 |
falken
2017/05/29 06:51:12
Is it worth making a class comment?
URLLoaderRequ
kinuko
2017/05/29 07:05:58
Done, with slight modifications.
| |
61 class NavigationURLLoaderNetworkService::URLLoaderRequestController { | |
62 public: | |
63 URLLoaderRequestController(std::unique_ptr<ResourceRequest> resource_request, | |
64 ResourceContext* resource_context) | |
65 : resource_request_(std::move(resource_request)), | |
66 resource_context_(resource_context), | |
67 network_factory_(nullptr) {} | |
68 | |
69 virtual ~URLLoaderRequestController() { | |
70 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
71 } | |
72 | |
73 void Start( | |
74 ServiceWorkerNavigationHandleCore* service_worker_navigation_handle_core, | |
75 AppCacheNavigationHandleCore* appcache_handle_core, | |
76 std::unique_ptr<NavigationRequestInfo> request_info, | |
77 mojom::URLLoaderFactoryPtrInfo factory_for_webui, | |
78 scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter, | |
79 const base::Callback<WebContents*(void)>& web_contents_getter, | |
80 mojom::URLLoaderAssociatedRequest url_loader_request, | |
81 mojom::URLLoaderClientPtr url_loader_client_ptr, | |
82 std::unique_ptr<service_manager::Connector> connector) { | |
83 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
84 const ResourceType resource_type = request_info->is_main_frame | |
85 ? RESOURCE_TYPE_MAIN_FRAME | |
86 : RESOURCE_TYPE_SUB_FRAME; | |
87 | |
88 if (resource_request_->request_body) { | |
89 AttachRequestBodyBlobDataHandles(resource_request_->request_body.get(), | |
90 resource_context_); | |
91 } | |
92 | |
93 // Requests to WebUI scheme won't get redirected to/from other schemes | |
94 // or be intercepted, so we just let it go here. | |
95 if (factory_for_webui.is_valid()) { | |
96 mojom::URLLoaderFactoryPtr factory_ptr; | |
97 factory_ptr.Bind(std::move(factory_for_webui)); | |
98 factory_ptr->CreateLoaderAndStart( | |
99 std::move(url_loader_request), 0 /* routing_id? */, | |
100 0 /* request_id? */, mojom::kURLLoadOptionSendSSLInfo, | |
101 *resource_request_, std::move(url_loader_client_ptr)); | |
102 return; | |
103 } | |
104 | |
105 DCHECK(handlers_.empty()); | |
106 if (service_worker_navigation_handle_core) { | |
107 RequestContextFrameType frame_type = | |
108 request_info->is_main_frame ? REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL | |
109 : REQUEST_CONTEXT_FRAME_TYPE_NESTED; | |
110 | |
111 storage::BlobStorageContext* blob_storage_context = GetBlobStorageContext( | |
112 GetChromeBlobStorageContextForResourceContext(resource_context_)); | |
113 std::unique_ptr<URLLoaderRequestHandler> service_worker_handler = | |
114 ServiceWorkerRequestHandler::InitializeForNavigationNetworkService( | |
115 *resource_request_, resource_context_, | |
116 service_worker_navigation_handle_core, blob_storage_context, | |
117 request_info->begin_params.skip_service_worker, resource_type, | |
118 request_info->begin_params.request_context_type, frame_type, | |
119 request_info->are_ancestors_secure, | |
120 request_info->common_params.post_data, web_contents_getter); | |
121 if (service_worker_handler) | |
122 handlers_.push_back(std::move(service_worker_handler)); | |
123 } | |
124 | |
125 if (appcache_handle_core) { | |
126 // TODO: add appcache code here. | |
127 } | |
128 | |
129 DCHECK(!network_factory_); | |
130 network_factory_ = url_loader_factory_getter->GetNetworkFactory()->get(); | |
131 | |
132 Restart(std::move(url_loader_request), std::move(url_loader_client_ptr)); | |
133 } | |
134 | |
135 // This could be called multiple times. | |
136 void Restart(mojom::URLLoaderAssociatedRequest url_loader_request, | |
137 mojom::URLLoaderClientPtr url_loader_client_ptr) { | |
138 url_loader_request_ = std::move(url_loader_request); | |
139 url_loader_client_ptr_ = std::move(url_loader_client_ptr); | |
140 handler_index_ = 0; | |
141 MaybeStartLoader(nullptr); | |
142 } | |
143 | |
144 void MaybeStartLoader(mojom::URLLoaderFactory* factory) { | |
145 DCHECK(url_loader_client_ptr_.is_bound()); | |
146 | |
147 if (factory) { | |
148 factory->CreateLoaderAndStart( | |
149 std::move(url_loader_request_), 0 /* routing_id? */, | |
150 0 /* request_id? */, mojom::kURLLoadOptionSendSSLInfo, | |
151 *resource_request_, std::move(url_loader_client_ptr_)); | |
152 return; | |
153 } | |
154 | |
155 if (handler_index_ < handlers_.size()) { | |
156 handlers_[handler_index_++]->MaybeCreateLoaderFactory( | |
157 *resource_request_, resource_context_, | |
158 base::BindOnce(&URLLoaderRequestController::MaybeStartLoader, | |
159 base::Unretained(this))); | |
160 return; | |
161 } | |
162 | |
163 DCHECK_EQ(handlers_.size(), handler_index_); | |
164 DCHECK(network_factory_ != nullptr); | |
165 MaybeStartLoader(network_factory_); | |
166 } | |
167 | |
168 private: | |
169 std::vector<std::unique_ptr<URLLoaderRequestHandler>> handlers_; | |
170 size_t handler_index_ = 0; | |
171 | |
172 std::unique_ptr<ResourceRequest> resource_request_; | |
173 ResourceContext* resource_context_; | |
174 | |
falken
2017/05/29 06:51:12
// The factory for doing a vanilla network request
kinuko
2017/05/29 07:05:58
Done.
| |
175 mojom::URLLoaderFactory* network_factory_; | |
176 | |
177 // Kept around until we create a loader. | |
178 mojom::URLLoaderAssociatedRequest url_loader_request_; | |
179 mojom::URLLoaderClientPtr url_loader_client_ptr_; | |
180 | |
181 DISALLOW_COPY_AND_ASSIGN(URLLoaderRequestController); | |
182 }; | |
183 | |
124 NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService( | 184 NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService( |
125 ResourceContext* resource_context, | 185 ResourceContext* resource_context, |
126 StoragePartition* storage_partition, | 186 StoragePartition* storage_partition, |
127 std::unique_ptr<NavigationRequestInfo> request_info, | 187 std::unique_ptr<NavigationRequestInfo> request_info, |
128 std::unique_ptr<NavigationUIData> navigation_ui_data, | 188 std::unique_ptr<NavigationUIData> navigation_ui_data, |
129 ServiceWorkerNavigationHandle* service_worker_navigation_handle, | 189 ServiceWorkerNavigationHandle* service_worker_navigation_handle, |
130 AppCacheNavigationHandle* appcache_handle, | 190 AppCacheNavigationHandle* appcache_handle, |
131 NavigationURLLoaderDelegate* delegate) | 191 NavigationURLLoaderDelegate* delegate) |
132 : delegate_(delegate), | 192 : delegate_(delegate), binding_(this) { |
133 binding_(this), | |
134 request_info_(std::move(request_info)) { | |
135 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 193 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
136 | 194 |
137 TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1( | 195 TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1( |
138 "navigation", "Navigation timeToResponseStarted", this, | 196 "navigation", "Navigation timeToResponseStarted", this, |
139 request_info_->common_params.navigation_start, "FrameTreeNode id", | 197 request_info->common_params.navigation_start, "FrameTreeNode id", |
140 request_info_->frame_tree_node_id); | 198 request_info->frame_tree_node_id); |
141 | 199 |
142 // TODO(scottmg): Port over stuff from RDHI::BeginNavigationRequest() here. | 200 // TODO(scottmg): Port over stuff from RDHI::BeginNavigationRequest() here. |
143 auto new_request = base::MakeUnique<ResourceRequest>(); | 201 auto new_request = base::MakeUnique<ResourceRequest>(); |
144 | 202 |
145 new_request->method = request_info_->common_params.method; | 203 new_request->method = request_info->common_params.method; |
146 new_request->url = request_info_->common_params.url; | 204 new_request->url = request_info->common_params.url; |
147 new_request->first_party_for_cookies = request_info_->first_party_for_cookies; | 205 new_request->first_party_for_cookies = request_info->first_party_for_cookies; |
148 new_request->priority = net::HIGHEST; | 206 new_request->priority = net::HIGHEST; |
149 | 207 |
150 // The code below to set fields like request_initiator, referrer, etc has | 208 // The code below to set fields like request_initiator, referrer, etc has |
151 // been copied from ResourceDispatcherHostImpl. We did not refactor the | 209 // been copied from ResourceDispatcherHostImpl. We did not refactor the |
152 // common code into a function, because RDHI uses accessor functions on the | 210 // common code into a function, because RDHI uses accessor functions on the |
153 // URLRequest class to set these fields. whereas we use ResourceRequest here. | 211 // URLRequest class to set these fields. whereas we use ResourceRequest here. |
154 new_request->request_initiator = request_info_->begin_params.initiator_origin; | 212 new_request->request_initiator = request_info->begin_params.initiator_origin; |
155 new_request->referrer = request_info_->common_params.referrer.url; | 213 new_request->referrer = request_info->common_params.referrer.url; |
156 new_request->referrer_policy = request_info_->common_params.referrer.policy; | 214 new_request->referrer_policy = request_info->common_params.referrer.policy; |
157 new_request->headers = request_info_->begin_params.headers; | 215 new_request->headers = request_info->begin_params.headers; |
158 | 216 |
159 int load_flags = request_info_->begin_params.load_flags; | 217 int load_flags = request_info->begin_params.load_flags; |
160 load_flags |= net::LOAD_VERIFY_EV_CERT; | 218 load_flags |= net::LOAD_VERIFY_EV_CERT; |
161 if (request_info_->is_main_frame) | 219 if (request_info->is_main_frame) |
162 load_flags |= net::LOAD_MAIN_FRAME_DEPRECATED; | 220 load_flags |= net::LOAD_MAIN_FRAME_DEPRECATED; |
163 | 221 |
164 // Sync loads should have maximum priority and should be the only | 222 // Sync loads should have maximum priority and should be the only |
165 // requests that have the ignore limits flag set. | 223 // requests that have the ignore limits flag set. |
166 DCHECK(!(load_flags & net::LOAD_IGNORE_LIMITS)); | 224 DCHECK(!(load_flags & net::LOAD_IGNORE_LIMITS)); |
167 | 225 |
168 new_request->load_flags = load_flags; | 226 new_request->load_flags = load_flags; |
169 | 227 |
170 new_request->request_body = request_info_->common_params.post_data.get(); | 228 new_request->request_body = request_info->common_params.post_data.get(); |
229 | |
230 int frame_tree_node_id = request_info->frame_tree_node_id; | |
171 | 231 |
172 mojom::URLLoaderAssociatedRequest loader_associated_request = | 232 mojom::URLLoaderAssociatedRequest loader_associated_request = |
173 mojo::MakeRequest(&url_loader_associated_ptr_); | 233 mojo::MakeRequest(&url_loader_associated_ptr_); |
174 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass; | 234 mojom::URLLoaderClientPtr url_loader_client_ptr_to_pass; |
175 binding_.Bind(mojo::MakeRequest(&url_loader_client_ptr_to_pass)); | 235 binding_.Bind(mojo::MakeRequest(&url_loader_client_ptr_to_pass)); |
176 | 236 |
177 // Check if a web UI scheme wants to handle this request. | 237 // Check if a web UI scheme wants to handle this request. |
178 mojom::URLLoaderFactoryPtrInfo factory_ptr_info; | 238 mojom::URLLoaderFactoryPtrInfo factory_for_webui; |
179 | |
180 const auto& schemes = URLDataManagerBackend::GetWebUISchemes(); | 239 const auto& schemes = URLDataManagerBackend::GetWebUISchemes(); |
181 if (std::find(schemes.begin(), schemes.end(), new_request->url.scheme()) != | 240 if (std::find(schemes.begin(), schemes.end(), new_request->url.scheme()) != |
182 schemes.end()) { | 241 schemes.end()) { |
183 FrameTreeNode* frame_tree_node = | 242 FrameTreeNode* frame_tree_node = |
184 FrameTreeNode::GloballyFindByID(request_info_->frame_tree_node_id); | 243 FrameTreeNode::GloballyFindByID(frame_tree_node_id); |
185 factory_ptr_info = GetWebUIURLLoader(frame_tree_node).PassInterface(); | 244 factory_for_webui = GetWebUIURLLoader(frame_tree_node).PassInterface(); |
186 } | 245 } |
187 | 246 |
188 g_next_request_id--; | 247 g_next_request_id--; |
189 | 248 |
249 DCHECK(!request_controller_); | |
250 request_controller_ = base::MakeUnique<URLLoaderRequestController>( | |
251 std::move(new_request), resource_context); | |
190 BrowserThread::PostTask( | 252 BrowserThread::PostTask( |
191 BrowserThread::IO, FROM_HERE, | 253 BrowserThread::IO, FROM_HERE, |
192 base::Bind(&PrepareNavigationStartOnIO, | 254 base::Bind( |
193 base::Passed(std::move(new_request)), resource_context, | 255 &URLLoaderRequestController::Start, |
194 service_worker_navigation_handle | 256 base::Unretained(request_controller_.get()), |
195 ? service_worker_navigation_handle->core() | 257 service_worker_navigation_handle |
196 : nullptr, | 258 ? service_worker_navigation_handle->core() |
197 appcache_handle ? appcache_handle->core() : nullptr, | 259 : nullptr, |
198 request_info_.get(), base::Passed(std::move(factory_ptr_info)), | 260 appcache_handle ? appcache_handle->core() : nullptr, |
199 static_cast<StoragePartitionImpl*>(storage_partition) | 261 base::Passed(std::move(request_info)), |
200 ->url_loader_factory_getter(), | 262 base::Passed(std::move(factory_for_webui)), |
201 base::Bind(&GetWebContentsFromFrameTreeNodeID, | 263 static_cast<StoragePartitionImpl*>(storage_partition) |
202 request_info_->frame_tree_node_id), | 264 ->url_loader_factory_getter(), |
203 base::Passed(std::move(loader_associated_request)), | 265 base::Bind(&GetWebContentsFromFrameTreeNodeID, frame_tree_node_id), |
204 base::Passed(std::move(url_loader_client_ptr_to_pass)), | 266 base::Passed(std::move(loader_associated_request)), |
205 base::Passed(ServiceManagerConnection::GetForProcess() | 267 base::Passed(std::move(url_loader_client_ptr_to_pass)), |
206 ->GetConnector() | 268 base::Passed(ServiceManagerConnection::GetForProcess() |
207 ->Clone()))); | 269 ->GetConnector() |
270 ->Clone()))); | |
208 } | 271 } |
209 | 272 |
210 NavigationURLLoaderNetworkService::~NavigationURLLoaderNetworkService() {} | 273 NavigationURLLoaderNetworkService::~NavigationURLLoaderNetworkService() { |
274 BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, | |
275 request_controller_.release()); | |
276 } | |
211 | 277 |
212 void NavigationURLLoaderNetworkService::FollowRedirect() { | 278 void NavigationURLLoaderNetworkService::FollowRedirect() { |
213 url_loader_associated_ptr_->FollowRedirect(); | 279 url_loader_associated_ptr_->FollowRedirect(); |
214 } | 280 } |
215 | 281 |
216 void NavigationURLLoaderNetworkService::ProceedWithResponse() {} | 282 void NavigationURLLoaderNetworkService::ProceedWithResponse() {} |
217 | 283 |
218 void NavigationURLLoaderNetworkService::OnReceiveResponse( | 284 void NavigationURLLoaderNetworkService::OnReceiveResponse( |
219 const ResourceResponseHead& head, | 285 const ResourceResponseHead& head, |
220 const base::Optional<net::SSLInfo>& ssl_info, | 286 const base::Optional<net::SSLInfo>& ssl_info, |
221 mojom::DownloadedTempFilePtr downloaded_file) { | 287 mojom::DownloadedTempFilePtr downloaded_file) { |
222 // TODO(scottmg): This needs to do more of what | 288 // TODO(scottmg): This needs to do more of what |
223 // NavigationResourceHandler::OnReponseStarted() does. Or maybe in | 289 // NavigationResourceHandler::OnReponseStarted() does. Or maybe in |
224 // OnStartLoadingResponseBody(). | 290 // OnStartLoadingResponseBody(). |
225 if (ssl_info && ssl_info->cert) | 291 if (ssl_info && ssl_info->cert) |
226 NavigationResourceHandler::GetSSLStatusForRequest(*ssl_info, &ssl_status_); | 292 NavigationResourceHandler::GetSSLStatusForRequest(*ssl_info, &ssl_status_); |
227 response_ = base::MakeRefCounted<ResourceResponse>(); | 293 response_ = base::MakeRefCounted<ResourceResponse>(); |
228 response_->head = head; | 294 response_->head = head; |
229 } | 295 } |
230 | 296 |
231 void NavigationURLLoaderNetworkService::OnReceiveRedirect( | 297 void NavigationURLLoaderNetworkService::OnReceiveRedirect( |
232 const net::RedirectInfo& redirect_info, | 298 const net::RedirectInfo& redirect_info, |
233 const ResourceResponseHead& head) { | 299 const ResourceResponseHead& head) { |
234 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 300 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
301 // TODO(kinuko): Perform the necessary check and call | |
302 // URLLoaderRequestController::Restart with the new URL?? | |
235 scoped_refptr<ResourceResponse> response(new ResourceResponse()); | 303 scoped_refptr<ResourceResponse> response(new ResourceResponse()); |
236 response->head = head; | 304 response->head = head; |
237 delegate_->OnRequestRedirected(redirect_info, response); | 305 delegate_->OnRequestRedirected(redirect_info, response); |
238 } | 306 } |
239 | 307 |
240 void NavigationURLLoaderNetworkService::OnDataDownloaded( | 308 void NavigationURLLoaderNetworkService::OnDataDownloaded( |
241 int64_t data_length, | 309 int64_t data_length, |
242 int64_t encoded_length) {} | 310 int64_t encoded_length) {} |
243 | 311 |
244 void NavigationURLLoaderNetworkService::OnUploadProgress( | 312 void NavigationURLLoaderNetworkService::OnUploadProgress( |
(...skipping 30 matching lines...) Expand all Loading... | |
275 TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted", | 343 TRACE_EVENT_ASYNC_END2("navigation", "Navigation timeToResponseStarted", |
276 this, "&NavigationURLLoaderNetworkService", this, | 344 this, "&NavigationURLLoaderNetworkService", this, |
277 "success", false); | 345 "success", false); |
278 | 346 |
279 delegate_->OnRequestFailed(completion_status.exists_in_cache, | 347 delegate_->OnRequestFailed(completion_status.exists_in_cache, |
280 completion_status.error_code); | 348 completion_status.error_code); |
281 } | 349 } |
282 } | 350 } |
283 | 351 |
284 } // namespace content | 352 } // namespace content |
OLD | NEW |