OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mojo_async_resource_handler.h" | 5 #include "content/browser/loader/mojo_async_resource_handler.h" |
6 | 6 |
| 7 #include <algorithm> |
7 #include <utility> | 8 #include <utility> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
| 11 #include "base/bind.h" |
10 #include "base/command_line.h" | 12 #include "base/command_line.h" |
11 #include "base/containers/hash_tables.h" | |
12 #include "base/logging.h" | 13 #include "base/logging.h" |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/ptr_util.h" |
14 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
15 #include "base/time/time.h" | 17 #include "base/time/time.h" |
16 #include "content/browser/loader/downloaded_temp_file_impl.h" | 18 #include "content/browser/loader/downloaded_temp_file_impl.h" |
17 #include "content/browser/loader/netlog_observer.h" | 19 #include "content/browser/loader/netlog_observer.h" |
18 #include "content/browser/loader/resource_controller.h" | 20 #include "content/browser/loader/resource_controller.h" |
19 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 21 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
20 #include "content/browser/loader/resource_request_info_impl.h" | 22 #include "content/browser/loader/resource_request_info_impl.h" |
| 23 #include "content/browser/loader/upload_progress_tracker.h" |
21 #include "content/common/resource_request_completion_status.h" | 24 #include "content/common/resource_request_completion_status.h" |
22 #include "content/public/browser/global_request_id.h" | 25 #include "content/public/browser/global_request_id.h" |
23 #include "content/public/browser/resource_dispatcher_host_delegate.h" | 26 #include "content/public/browser/resource_dispatcher_host_delegate.h" |
24 #include "content/public/common/resource_response.h" | 27 #include "content/public/common/resource_response.h" |
25 #include "mojo/public/c/system/data_pipe.h" | 28 #include "mojo/public/c/system/data_pipe.h" |
26 #include "mojo/public/cpp/bindings/message.h" | 29 #include "mojo/public/cpp/bindings/message.h" |
27 #include "mojo/public/cpp/system/data_pipe.h" | 30 #include "mojo/public/cpp/system/data_pipe.h" |
28 #include "net/base/io_buffer.h" | 31 #include "net/base/io_buffer.h" |
29 #include "net/base/load_flags.h" | |
30 #include "net/base/mime_sniffer.h" | 32 #include "net/base/mime_sniffer.h" |
31 #include "net/url_request/redirect_info.h" | 33 #include "net/url_request/redirect_info.h" |
32 | 34 |
33 namespace content { | 35 namespace content { |
34 namespace { | 36 namespace { |
35 | 37 |
36 int g_allocation_size = MojoAsyncResourceHandler::kDefaultAllocationSize; | 38 int g_allocation_size = MojoAsyncResourceHandler::kDefaultAllocationSize; |
37 | 39 |
38 // MimeTypeResourceHandler *implicitly* requires that the buffer size | 40 // MimeTypeResourceHandler *implicitly* requires that the buffer size |
39 // returned from OnWillRead should be larger than certain size. | 41 // returned from OnWillRead should be larger than certain size. |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 // TODO(davidben): Is it necessary to pass the new first party URL for | 152 // TODO(davidben): Is it necessary to pass the new first party URL for |
151 // cookies? The only case where it can change is top-level navigation requests | 153 // cookies? The only case where it can change is top-level navigation requests |
152 // and hopefully those will eventually all be owned by the browser. It's | 154 // and hopefully those will eventually all be owned by the browser. It's |
153 // possible this is still needed while renderer-owned ones exist. | 155 // possible this is still needed while renderer-owned ones exist. |
154 url_loader_client_->OnReceiveRedirect(redirect_info, response->head); | 156 url_loader_client_->OnReceiveRedirect(redirect_info, response->head); |
155 return true; | 157 return true; |
156 } | 158 } |
157 | 159 |
158 bool MojoAsyncResourceHandler::OnResponseStarted(ResourceResponse* response, | 160 bool MojoAsyncResourceHandler::OnResponseStarted(ResourceResponse* response, |
159 bool* defer) { | 161 bool* defer) { |
| 162 if (upload_progress_tracker_) { |
| 163 upload_progress_tracker_->OnUploadCompleted(); |
| 164 upload_progress_tracker_ = nullptr; |
| 165 } |
| 166 |
160 const ResourceRequestInfoImpl* info = GetRequestInfo(); | 167 const ResourceRequestInfoImpl* info = GetRequestInfo(); |
161 | |
162 if (rdh_->delegate()) { | 168 if (rdh_->delegate()) { |
163 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(), | 169 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(), |
164 response); | 170 response); |
165 } | 171 } |
166 | 172 |
167 NetLogObserver::PopulateResponseInfo(request(), response); | 173 NetLogObserver::PopulateResponseInfo(request(), response); |
168 response->head.encoded_data_length = request()->raw_header_size(); | 174 response->head.encoded_data_length = request()->raw_header_size(); |
169 reported_total_received_bytes_ = response->head.encoded_data_length; | 175 reported_total_received_bytes_ = response->head.encoded_data_length; |
170 | 176 |
171 response->head.request_start = request()->creation_time(); | 177 response->head.request_start = request()->creation_time(); |
(...skipping 15 matching lines...) Expand all Loading... |
187 if (metadata) { | 193 if (metadata) { |
188 const uint8_t* data = reinterpret_cast<const uint8_t*>(metadata->data()); | 194 const uint8_t* data = reinterpret_cast<const uint8_t*>(metadata->data()); |
189 | 195 |
190 url_loader_client_->OnReceiveCachedMetadata( | 196 url_loader_client_->OnReceiveCachedMetadata( |
191 std::vector<uint8_t>(data, data + metadata->size())); | 197 std::vector<uint8_t>(data, data + metadata->size())); |
192 } | 198 } |
193 return true; | 199 return true; |
194 } | 200 } |
195 | 201 |
196 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) { | 202 bool MojoAsyncResourceHandler::OnWillStart(const GURL& url, bool* defer) { |
| 203 if (GetRequestInfo()->is_upload_progress_enabled() && |
| 204 request()->has_upload()) { |
| 205 upload_progress_tracker_ = base::MakeUnique<UploadProgressTracker>( |
| 206 FROM_HERE, |
| 207 base::BindRepeating(&MojoAsyncResourceHandler::SendUploadProgress, |
| 208 base::Unretained(this)), |
| 209 request()); |
| 210 } |
| 211 |
197 return true; | 212 return true; |
198 } | 213 } |
199 | 214 |
200 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, | 215 bool MojoAsyncResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, |
201 int* buf_size, | 216 int* buf_size, |
202 int min_size) { | 217 int min_size) { |
203 DCHECK_EQ(-1, min_size); | 218 DCHECK_EQ(-1, min_size); |
204 | 219 |
205 if (!CheckForSufficientResource()) | 220 if (!CheckForSufficientResource()) |
206 return false; | 221 return false; |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 } | 348 } |
334 | 349 |
335 net::IOBufferWithSize* MojoAsyncResourceHandler::GetResponseMetadata( | 350 net::IOBufferWithSize* MojoAsyncResourceHandler::GetResponseMetadata( |
336 net::URLRequest* request) { | 351 net::URLRequest* request) { |
337 return request->response_info().metadata.get(); | 352 return request->response_info().metadata.get(); |
338 } | 353 } |
339 | 354 |
340 void MojoAsyncResourceHandler::OnResponseCompleted( | 355 void MojoAsyncResourceHandler::OnResponseCompleted( |
341 const net::URLRequestStatus& status, | 356 const net::URLRequestStatus& status, |
342 bool* defer) { | 357 bool* defer) { |
| 358 if (upload_progress_tracker_) { |
| 359 upload_progress_tracker_->OnUploadCompleted(); |
| 360 upload_progress_tracker_ = nullptr; |
| 361 } |
| 362 |
343 shared_writer_ = nullptr; | 363 shared_writer_ = nullptr; |
344 buffer_ = nullptr; | 364 buffer_ = nullptr; |
345 handle_watcher_.Cancel(); | 365 handle_watcher_.Cancel(); |
346 | 366 |
347 const ResourceRequestInfoImpl* info = GetRequestInfo(); | 367 const ResourceRequestInfoImpl* info = GetRequestInfo(); |
348 | 368 |
349 // TODO(gavinp): Remove this CHECK when we figure out the cause of | 369 // TODO(gavinp): Remove this CHECK when we figure out the cause of |
350 // http://crbug.com/124680 . This check mirrors closely check in | 370 // http://crbug.com/124680 . This check mirrors closely check in |
351 // WebURLLoaderImpl::OnCompletedRequest that routes this message to a WebCore | 371 // WebURLLoaderImpl::OnCompletedRequest that routes this message to a WebCore |
352 // ResourceHandleInternal which asserts on its state and crashes. By crashing | 372 // ResourceHandleInternal which asserts on its state and crashes. By crashing |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 void MojoAsyncResourceHandler::OnTransfer( | 504 void MojoAsyncResourceHandler::OnTransfer( |
485 mojom::URLLoaderAssociatedRequest mojo_request, | 505 mojom::URLLoaderAssociatedRequest mojo_request, |
486 mojom::URLLoaderClientAssociatedPtr url_loader_client) { | 506 mojom::URLLoaderClientAssociatedPtr url_loader_client) { |
487 binding_.Unbind(); | 507 binding_.Unbind(); |
488 binding_.Bind(std::move(mojo_request)); | 508 binding_.Bind(std::move(mojo_request)); |
489 binding_.set_connection_error_handler( | 509 binding_.set_connection_error_handler( |
490 base::Bind(&MojoAsyncResourceHandler::Cancel, base::Unretained(this))); | 510 base::Bind(&MojoAsyncResourceHandler::Cancel, base::Unretained(this))); |
491 url_loader_client_ = std::move(url_loader_client); | 511 url_loader_client_ = std::move(url_loader_client); |
492 } | 512 } |
493 | 513 |
| 514 void MojoAsyncResourceHandler::SendUploadProgress( |
| 515 const net::UploadProgress& progress) { |
| 516 url_loader_client_->OnUploadProgress( |
| 517 progress.position(), progress.size(), |
| 518 base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK, |
| 519 weak_factory_.GetWeakPtr())); |
| 520 } |
| 521 |
| 522 void MojoAsyncResourceHandler::OnUploadProgressACK() { |
| 523 if (upload_progress_tracker_) |
| 524 upload_progress_tracker_->OnAckReceived(); |
| 525 } |
| 526 |
494 } // namespace content | 527 } // namespace content |
OLD | NEW |