| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/detachable_resource_handler.h" | 5 #include "content/browser/loader/detachable_resource_handler.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 11 #include "base/metrics/histogram_macros.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "content/browser/loader/null_resource_controller.h" | 13 #include "content/browser/loader/null_resource_controller.h" |
| 13 #include "content/browser/loader/resource_controller.h" | 14 #include "content/browser/loader/resource_controller.h" |
| 14 #include "content/browser/loader/resource_request_info_impl.h" | 15 #include "content/browser/loader/resource_request_info_impl.h" |
| 15 #include "net/base/io_buffer.h" | 16 #include "net/base/io_buffer.h" |
| 16 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
| 17 #include "net/url_request/url_request.h" | 18 #include "net/url_request/url_request.h" |
| 18 #include "net/url_request/url_request_status.h" | 19 #include "net/url_request/url_request_status.h" |
| 19 | 20 |
| 20 namespace { | 21 namespace { |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 } | 234 } |
| 234 | 235 |
| 235 HoldController(std::move(controller)); | 236 HoldController(std::move(controller)); |
| 236 next_handler_->OnReadCompleted(bytes_read, | 237 next_handler_->OnReadCompleted(bytes_read, |
| 237 base::MakeUnique<Controller>(this)); | 238 base::MakeUnique<Controller>(this)); |
| 238 } | 239 } |
| 239 | 240 |
| 240 void DetachableResourceHandler::OnResponseCompleted( | 241 void DetachableResourceHandler::OnResponseCompleted( |
| 241 const net::URLRequestStatus& status, | 242 const net::URLRequestStatus& status, |
| 242 std::unique_ptr<ResourceController> controller) { | 243 std::unique_ptr<ResourceController> controller) { |
| 244 UMA_HISTOGRAM_MEDIUM_TIMES( |
| 245 "Net.DetachableResourceHandler.Duration", |
| 246 base::TimeTicks::Now() - request()->creation_time()); |
| 247 |
| 243 // No DCHECK(!is_deferred_) as the request may have been cancelled while | 248 // No DCHECK(!is_deferred_) as the request may have been cancelled while |
| 244 // deferred. | 249 // deferred. |
| 245 | 250 |
| 246 if (!next_handler_) { | 251 if (!next_handler_) { |
| 247 controller->Resume(); | 252 controller->Resume(); |
| 248 return; | 253 return; |
| 249 } | 254 } |
| 250 | 255 |
| 251 is_finished_ = true; | 256 is_finished_ = true; |
| 252 | 257 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 271 void DetachableResourceHandler::OnTimedOut() { | 276 void DetachableResourceHandler::OnTimedOut() { |
| 272 // Requests are only timed out after being detached, and shouldn't be deferred | 277 // Requests are only timed out after being detached, and shouldn't be deferred |
| 273 // once detached. | 278 // once detached. |
| 274 DCHECK(!next_handler_); | 279 DCHECK(!next_handler_); |
| 275 DCHECK(!has_controller()); | 280 DCHECK(!has_controller()); |
| 276 | 281 |
| 277 OutOfBandCancel(net::ERR_ABORTED, true /* tell_renderer */); | 282 OutOfBandCancel(net::ERR_ABORTED, true /* tell_renderer */); |
| 278 } | 283 } |
| 279 | 284 |
| 280 } // namespace content | 285 } // namespace content |
| OLD | NEW |