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

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

Issue 2741433002: Fix ResourceDispatcherHostDelegate::OnResponseStarted not getting called for navigation requests (Closed)
Patch Set: fix mojo unittests Created 3 years, 9 months 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 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 <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "content/browser/loader/downloaded_temp_file_impl.h" 19 #include "content/browser/loader/downloaded_temp_file_impl.h"
20 #include "content/browser/loader/netlog_observer.h" 20 #include "content/browser/loader/netlog_observer.h"
21 #include "content/browser/loader/resource_controller.h" 21 #include "content/browser/loader/resource_controller.h"
22 #include "content/browser/loader/resource_dispatcher_host_impl.h" 22 #include "content/browser/loader/resource_dispatcher_host_impl.h"
23 #include "content/browser/loader/resource_request_info_impl.h" 23 #include "content/browser/loader/resource_request_info_impl.h"
24 #include "content/browser/loader/resource_scheduler.h" 24 #include "content/browser/loader/resource_scheduler.h"
25 #include "content/browser/loader/upload_progress_tracker.h" 25 #include "content/browser/loader/upload_progress_tracker.h"
26 #include "content/common/resource_request_completion_status.h" 26 #include "content/common/resource_request_completion_status.h"
27 #include "content/public/browser/global_request_id.h" 27 #include "content/public/browser/global_request_id.h"
28 #include "content/public/browser/resource_dispatcher_host_delegate.h"
29 #include "content/public/common/resource_response.h" 28 #include "content/public/common/resource_response.h"
30 #include "mojo/public/c/system/data_pipe.h" 29 #include "mojo/public/c/system/data_pipe.h"
31 #include "mojo/public/cpp/bindings/message.h" 30 #include "mojo/public/cpp/bindings/message.h"
32 #include "net/base/io_buffer.h" 31 #include "net/base/io_buffer.h"
33 #include "net/base/mime_sniffer.h" 32 #include "net/base/mime_sniffer.h"
34 #include "net/url_request/redirect_info.h" 33 #include "net/url_request/redirect_info.h"
35 34
36 namespace content { 35 namespace content {
37 namespace { 36 namespace {
38 37
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 ResourceResponse* response, 172 ResourceResponse* response,
174 std::unique_ptr<ResourceController> controller) { 173 std::unique_ptr<ResourceController> controller) {
175 DCHECK(!has_controller()); 174 DCHECK(!has_controller());
176 175
177 if (upload_progress_tracker_) { 176 if (upload_progress_tracker_) {
178 upload_progress_tracker_->OnUploadCompleted(); 177 upload_progress_tracker_->OnUploadCompleted();
179 upload_progress_tracker_ = nullptr; 178 upload_progress_tracker_ = nullptr;
180 } 179 }
181 180
182 const ResourceRequestInfoImpl* info = GetRequestInfo(); 181 const ResourceRequestInfoImpl* info = GetRequestInfo();
183 if (rdh_->delegate()) {
184 rdh_->delegate()->OnResponseStarted(request(), info->GetContext(),
185 response);
186 }
187
188 NetLogObserver::PopulateResponseInfo(request(), response); 182 NetLogObserver::PopulateResponseInfo(request(), response);
189 response->head.encoded_data_length = request()->raw_header_size(); 183 response->head.encoded_data_length = request()->raw_header_size();
190 reported_total_received_bytes_ = response->head.encoded_data_length; 184 reported_total_received_bytes_ = response->head.encoded_data_length;
191 185
192 response->head.request_start = request()->creation_time(); 186 response->head.request_start = request()->creation_time();
193 response->head.response_start = base::TimeTicks::Now(); 187 response->head.response_start = base::TimeTicks::Now();
194 sent_received_response_message_ = true; 188 sent_received_response_message_ = true;
195 189
196 mojom::DownloadedTempFilePtr downloaded_file_ptr; 190 mojom::DownloadedTempFilePtr downloaded_file_ptr;
197 if (!response->head.download_file_path.empty()) { 191 if (!response->head.download_file_path.empty()) {
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK, 570 base::Bind(&MojoAsyncResourceHandler::OnUploadProgressACK,
577 weak_factory_.GetWeakPtr())); 571 weak_factory_.GetWeakPtr()));
578 } 572 }
579 573
580 void MojoAsyncResourceHandler::OnUploadProgressACK() { 574 void MojoAsyncResourceHandler::OnUploadProgressACK() {
581 if (upload_progress_tracker_) 575 if (upload_progress_tracker_)
582 upload_progress_tracker_->OnAckReceived(); 576 upload_progress_tracker_->OnAckReceived();
583 } 577 }
584 578
585 } // namespace content 579 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698