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/async_resource_handler.h" | 5 #include "content/browser/loader/async_resource_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "content/browser/loader/netlog_observer.h" | 21 #include "content/browser/loader/netlog_observer.h" |
22 #include "content/browser/loader/resource_buffer.h" | 22 #include "content/browser/loader/resource_buffer.h" |
23 #include "content/browser/loader/resource_controller.h" | 23 #include "content/browser/loader/resource_controller.h" |
24 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 24 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
25 #include "content/browser/loader/resource_message_filter.h" | 25 #include "content/browser/loader/resource_message_filter.h" |
26 #include "content/browser/loader/resource_request_info_impl.h" | 26 #include "content/browser/loader/resource_request_info_impl.h" |
27 #include "content/browser/loader/upload_progress_tracker.h" | 27 #include "content/browser/loader/upload_progress_tracker.h" |
28 #include "content/common/resource_messages.h" | 28 #include "content/common/resource_messages.h" |
29 #include "content/common/resource_request_completion_status.h" | 29 #include "content/common/resource_request_completion_status.h" |
30 #include "content/common/view_messages.h" | 30 #include "content/common/view_messages.h" |
31 #include "content/public/browser/resource_dispatcher_host_delegate.h" | |
32 #include "content/public/common/content_features.h" | 31 #include "content/public/common/content_features.h" |
33 #include "content/public/common/resource_response.h" | 32 #include "content/public/common/resource_response.h" |
34 #include "ipc/ipc_message_macros.h" | 33 #include "ipc/ipc_message_macros.h" |
35 #include "net/base/io_buffer.h" | 34 #include "net/base/io_buffer.h" |
36 #include "net/base/load_flags.h" | 35 #include "net/base/load_flags.h" |
37 #include "net/base/upload_progress.h" | 36 #include "net/base/upload_progress.h" |
38 #include "net/url_request/redirect_info.h" | 37 #include "net/url_request/redirect_info.h" |
39 | 38 |
40 using base::TimeDelta; | 39 using base::TimeDelta; |
41 using base::TimeTicks; | 40 using base::TimeTicks; |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 | 300 |
302 // We want to send a final upload progress message prior to sending the | 301 // We want to send a final upload progress message prior to sending the |
303 // response complete message even if we're waiting for an ack to to a | 302 // response complete message even if we're waiting for an ack to to a |
304 // previous upload progress message. | 303 // previous upload progress message. |
305 if (upload_progress_tracker_) { | 304 if (upload_progress_tracker_) { |
306 upload_progress_tracker_->OnUploadCompleted(); | 305 upload_progress_tracker_->OnUploadCompleted(); |
307 upload_progress_tracker_ = nullptr; | 306 upload_progress_tracker_ = nullptr; |
308 } | 307 } |
309 | 308 |
310 const ResourceRequestInfoImpl* info = GetRequestInfo(); | 309 const ResourceRequestInfoImpl* info = GetRequestInfo(); |
311 if (rdh_->delegate()) { | |
312 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(), | |
313 response); | |
314 } | |
315 | |
316 ResourceMessageFilter* filter = GetFilter(); | 310 ResourceMessageFilter* filter = GetFilter(); |
317 if (!filter) { | 311 if (!filter) { |
318 controller->Cancel(); | 312 controller->Cancel(); |
319 return; | 313 return; |
320 } | 314 } |
321 | 315 |
322 NetLogObserver::PopulateResponseInfo(request(), response); | 316 NetLogObserver::PopulateResponseInfo(request(), response); |
323 response->head.encoded_data_length = request()->raw_header_size(); | 317 response->head.encoded_data_length = request()->raw_header_size(); |
324 | 318 |
325 // If the parent handler downloaded the resource to a file, grant the child | 319 // If the parent handler downloaded the resource to a file, grant the child |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 void AsyncResourceHandler::SendUploadProgress( | 614 void AsyncResourceHandler::SendUploadProgress( |
621 const net::UploadProgress& progress) { | 615 const net::UploadProgress& progress) { |
622 ResourceMessageFilter* filter = GetFilter(); | 616 ResourceMessageFilter* filter = GetFilter(); |
623 if (!filter) | 617 if (!filter) |
624 return; | 618 return; |
625 filter->Send(new ResourceMsg_UploadProgress( | 619 filter->Send(new ResourceMsg_UploadProgress( |
626 GetRequestID(), progress.position(), progress.size())); | 620 GetRequestID(), progress.position(), progress.size())); |
627 } | 621 } |
628 | 622 |
629 } // namespace content | 623 } // namespace content |
OLD | NEW |