| 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" |
| 11 #include "base/containers/hash_tables.h" | 11 #include "base/containers/hash_tables.h" |
| 12 #include "base/debug/alias.h" | 12 #include "base/debug/alias.h" |
| 13 #include "base/feature_list.h" | 13 #include "base/feature_list.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/shared_memory.h" | 16 #include "base/memory/shared_memory.h" |
| 17 #include "base/metrics/histogram_macros.h" | 17 #include "base/metrics/histogram_macros.h" |
| 18 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
| 19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
| 20 #include "content/browser/host_zoom_map_impl.h" | 20 #include "content/browser/host_zoom_map_impl.h" |
| 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_dispatcher_host_impl.h" | 23 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 24 #include "content/browser/loader/resource_message_filter.h" | 24 #include "content/browser/loader/resource_message_filter.h" |
| 25 #include "content/browser/loader/resource_request_info_impl.h" | 25 #include "content/browser/loader/resource_request_info_impl.h" |
| 26 #include "content/browser/resource_context_impl.h" | 26 #include "content/browser/resource_context_impl.h" |
| 27 #include "content/common/resource_messages.h" | 27 #include "content/common/resource_messages.h" |
| 28 #include "content/common/resource_request_completion_status.h" |
| 28 #include "content/common/view_messages.h" | 29 #include "content/common/view_messages.h" |
| 29 #include "content/public/browser/resource_dispatcher_host_delegate.h" | 30 #include "content/public/browser/resource_dispatcher_host_delegate.h" |
| 30 #include "content/public/common/content_features.h" | 31 #include "content/public/common/content_features.h" |
| 31 #include "content/public/common/resource_response.h" | 32 #include "content/public/common/resource_response.h" |
| 32 #include "net/base/io_buffer.h" | 33 #include "net/base/io_buffer.h" |
| 33 #include "net/base/load_flags.h" | 34 #include "net/base/load_flags.h" |
| 34 #include "net/log/net_log.h" | 35 #include "net/log/net_log.h" |
| 35 #include "net/url_request/redirect_info.h" | 36 #include "net/url_request/redirect_info.h" |
| 36 | 37 |
| 37 using base::TimeDelta; | 38 using base::TimeDelta; |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 // TODO(mkosiba): Fix up cases where we create a URLRequestStatus | 517 // TODO(mkosiba): Fix up cases where we create a URLRequestStatus |
| 517 // with a status() != SUCCESS and an error_code() == net::OK. | 518 // with a status() != SUCCESS and an error_code() == net::OK. |
| 518 if (status.status() == net::URLRequestStatus::CANCELED && | 519 if (status.status() == net::URLRequestStatus::CANCELED && |
| 519 error_code == net::OK) { | 520 error_code == net::OK) { |
| 520 error_code = net::ERR_ABORTED; | 521 error_code = net::ERR_ABORTED; |
| 521 } else if (status.status() == net::URLRequestStatus::FAILED && | 522 } else if (status.status() == net::URLRequestStatus::FAILED && |
| 522 error_code == net::OK) { | 523 error_code == net::OK) { |
| 523 error_code = net::ERR_FAILED; | 524 error_code = net::ERR_FAILED; |
| 524 } | 525 } |
| 525 | 526 |
| 526 ResourceMsg_RequestCompleteData request_complete_data; | 527 ResourceRequestCompletionStatus request_complete_data; |
| 527 request_complete_data.error_code = error_code; | 528 request_complete_data.error_code = error_code; |
| 528 request_complete_data.was_ignored_by_handler = was_ignored_by_handler; | 529 request_complete_data.was_ignored_by_handler = was_ignored_by_handler; |
| 529 request_complete_data.exists_in_cache = request()->response_info().was_cached; | 530 request_complete_data.exists_in_cache = request()->response_info().was_cached; |
| 530 request_complete_data.security_info = security_info; | 531 request_complete_data.security_info = security_info; |
| 531 request_complete_data.completion_time = TimeTicks::Now(); | 532 request_complete_data.completion_time = TimeTicks::Now(); |
| 532 request_complete_data.encoded_data_length = | 533 request_complete_data.encoded_data_length = |
| 533 request()->GetTotalReceivedBytes(); | 534 request()->GetTotalReceivedBytes(); |
| 534 info->filter()->Send( | 535 info->filter()->Send( |
| 535 new ResourceMsg_RequestComplete(GetRequestID(), request_complete_data)); | 536 new ResourceMsg_RequestComplete(GetRequestID(), request_complete_data)); |
| 536 | 537 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 } else { | 602 } else { |
| 602 UMA_HISTOGRAM_CUSTOM_COUNTS( | 603 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 603 "Net.ResourceLoader.ResponseStartToEnd.Over_512kB", | 604 "Net.ResourceLoader.ResponseStartToEnd.Over_512kB", |
| 604 elapsed_time, 1, 100000, 100); | 605 elapsed_time, 1, 100000, 100); |
| 605 } | 606 } |
| 606 | 607 |
| 607 inlining_helper_->RecordHistogram(elapsed_time); | 608 inlining_helper_->RecordHistogram(elapsed_time); |
| 608 } | 609 } |
| 609 | 610 |
| 610 } // namespace content | 611 } // namespace content |
| OLD | NEW |