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

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

Issue 1721813002: Adding DRP specfic UMA for FirstContentfulPaint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing nits Created 4 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 (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/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/profiler/scoped_tracker.h" 12 #include "base/profiler/scoped_tracker.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "content/browser/appcache/appcache_interceptor.h" 16 #include "content/browser/appcache/appcache_interceptor.h"
17 #include "content/browser/child_process_security_policy_impl.h" 17 #include "content/browser/child_process_security_policy_impl.h"
18 #include "content/browser/loader/cross_site_resource_handler.h" 18 #include "content/browser/loader/cross_site_resource_handler.h"
19 #include "content/browser/loader/detachable_resource_handler.h" 19 #include "content/browser/loader/detachable_resource_handler.h"
20 #include "content/browser/loader/resource_loader_delegate.h" 20 #include "content/browser/loader/resource_loader_delegate.h"
21 #include "content/browser/loader/resource_request_info_impl.h" 21 #include "content/browser/loader/resource_request_info_impl.h"
22 #include "content/browser/service_worker/service_worker_request_handler.h" 22 #include "content/browser/service_worker/service_worker_request_handler.h"
23 #include "content/browser/ssl/ssl_client_auth_handler.h" 23 #include "content/browser/ssl/ssl_client_auth_handler.h"
24 #include "content/browser/ssl/ssl_manager.h" 24 #include "content/browser/ssl/ssl_manager.h"
25 #include "content/browser/ssl/ssl_policy.h" 25 #include "content/browser/ssl/ssl_policy.h"
26 #include "content/common/ssl_status_serialization.h" 26 #include "content/common/ssl_status_serialization.h"
27 #include "content/public/browser/cert_store.h" 27 #include "content/public/browser/cert_store.h"
28 #include "content/public/browser/resource_context.h" 28 #include "content/public/browser/resource_context.h"
29 #include "content/public/browser/resource_dispatcher_host_delegate.h"
29 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" 30 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
30 #include "content/public/browser/signed_certificate_timestamp_store.h" 31 #include "content/public/browser/signed_certificate_timestamp_store.h"
31 #include "content/public/common/content_client.h" 32 #include "content/public/common/content_client.h"
32 #include "content/public/common/content_switches.h" 33 #include "content/public/common/content_switches.h"
33 #include "content/public/common/process_type.h" 34 #include "content/public/common/process_type.h"
34 #include "content/public/common/resource_response.h" 35 #include "content/public/common/resource_response.h"
35 #include "content/public/common/security_style.h" 36 #include "content/public/common/security_style.h"
36 #include "net/base/io_buffer.h" 37 #include "net/base/io_buffer.h"
37 #include "net/base/load_flags.h" 38 #include "net/base/load_flags.h"
38 #include "net/http/http_response_headers.h" 39 #include "net/http/http_response_headers.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps, 76 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps,
76 child_id, &signed_certificate_timestamp_ids); 77 child_id, &signed_certificate_timestamp_ids);
77 78
78 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource( 79 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource(
79 url, cert_id, ssl_info.cert_status), 80 url, cert_id, ssl_info.cert_status),
80 cert_id, signed_certificate_timestamp_ids, ssl_info); 81 cert_id, signed_certificate_timestamp_ids, ssl_info);
81 } 82 }
82 83
83 void PopulateResourceResponse(ResourceRequestInfoImpl* info, 84 void PopulateResourceResponse(ResourceRequestInfoImpl* info,
84 net::URLRequest* request, 85 net::URLRequest* request,
86 ResourceDispatcherHostDelegate* host_delegate,
87 ResourceContext* resource_context,
85 ResourceResponse* response) { 88 ResourceResponse* response) {
86 response->head.request_time = request->request_time(); 89 response->head.request_time = request->request_time();
87 response->head.response_time = request->response_time(); 90 response->head.response_time = request->response_time();
88 response->head.headers = request->response_headers(); 91 response->head.headers = request->response_headers();
89 request->GetCharset(&response->head.charset); 92 request->GetCharset(&response->head.charset);
90 response->head.content_length = request->GetExpectedContentSize(); 93 response->head.content_length = request->GetExpectedContentSize();
91 request->GetMimeType(&response->head.mime_type); 94 request->GetMimeType(&response->head.mime_type);
92 net::HttpResponseInfo response_info = request->response_info(); 95 net::HttpResponseInfo response_info = request->response_info();
93 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy; 96 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy;
94 response->head.was_npn_negotiated = response_info.was_npn_negotiated; 97 response->head.was_npn_negotiated = response_info.was_npn_negotiated;
95 response->head.npn_negotiated_protocol = 98 response->head.npn_negotiated_protocol =
96 response_info.npn_negotiated_protocol; 99 response_info.npn_negotiated_protocol;
97 response->head.connection_info = response_info.connection_info; 100 response->head.connection_info = response_info.connection_info;
98 response->head.was_fetched_via_proxy = request->was_fetched_via_proxy(); 101 response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
99 response->head.proxy_server = response_info.proxy_server; 102 response->head.proxy_server = response_info.proxy_server;
100 response->head.socket_address = request->GetSocketAddress(); 103 response->head.socket_address = request->GetSocketAddress();
101 const content::ResourceRequestInfo* request_info = 104 const content::ResourceRequestInfo* request_info =
102 content::ResourceRequestInfo::ForRequest(request); 105 content::ResourceRequestInfo::ForRequest(request);
103 if (request_info) 106 if (request_info)
104 response->head.is_using_lofi = request_info->IsUsingLoFi(); 107 response->head.is_using_lofi = request_info->IsUsingLoFi();
108 response->head.used_data_reduction_proxy =
109 resource_context && host_delegate &&
110 host_delegate->UsedDataReductionProxy(request->proxy_server(),
111 resource_context);
105 if (ServiceWorkerRequestHandler* handler = 112 if (ServiceWorkerRequestHandler* handler =
106 ServiceWorkerRequestHandler::GetHandler(request)) { 113 ServiceWorkerRequestHandler::GetHandler(request)) {
107 handler->GetExtraResponseInfo(&response->head); 114 handler->GetExtraResponseInfo(&response->head);
108 } 115 }
109 AppCacheInterceptor::GetExtraResponseInfo( 116 AppCacheInterceptor::GetExtraResponseInfo(
110 request, &response->head.appcache_id, 117 request, &response->head.appcache_id,
111 &response->head.appcache_manifest_url); 118 &response->head.appcache_manifest_url);
112 if (info->is_load_timing_enabled()) 119 if (info->is_load_timing_enabled())
113 request->GetLoadTimingInfo(&response->head.load_timing); 120 request->GetLoadTimingInfo(&response->head.load_timing);
114 121
(...skipping 11 matching lines...) Expand all
126 DCHECK_EQ(request->ssl_info().security_bits, -1); 133 DCHECK_EQ(request->ssl_info().security_bits, -1);
127 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); 134 DCHECK_EQ(request->ssl_info().key_exchange_info, 0);
128 DCHECK(!request->ssl_info().connection_status); 135 DCHECK(!request->ssl_info().connection_status);
129 } 136 }
130 } 137 }
131 138
132 } // namespace 139 } // namespace
133 140
134 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 141 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
135 scoped_ptr<ResourceHandler> handler, 142 scoped_ptr<ResourceHandler> handler,
136 ResourceLoaderDelegate* delegate) 143 ResourceLoaderDelegate* delegate,
144 ResourceDispatcherHostDelegate* host_delegate,
145 ResourceContext* resource_context)
137 : deferred_stage_(DEFERRED_NONE), 146 : deferred_stage_(DEFERRED_NONE),
138 request_(std::move(request)), 147 request_(std::move(request)),
139 handler_(std::move(handler)), 148 handler_(std::move(handler)),
140 delegate_(delegate), 149 delegate_(delegate),
150 host_delegate_(host_delegate),
151 resource_context_(resource_context),
141 is_transferring_(false), 152 is_transferring_(false),
142 times_cancelled_before_request_start_(0), 153 times_cancelled_before_request_start_(0),
143 started_request_(false), 154 started_request_(false),
144 times_cancelled_after_request_start_(0), 155 times_cancelled_after_request_start_(0),
145 weak_ptr_factory_(this) { 156 weak_ptr_factory_(this) {
146 request_->set_delegate(this); 157 request_->set_delegate(this);
147 handler_->SetController(this); 158 handler_->SetController(this);
148 } 159 }
149 160
150 ResourceLoader::~ResourceLoader() { 161 ResourceLoader::~ResourceLoader() {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 270
260 delegate_->DidReceiveRedirect(this, redirect_info.new_url); 271 delegate_->DidReceiveRedirect(this, redirect_info.new_url);
261 272
262 if (delegate_->HandleExternalProtocol(this, redirect_info.new_url)) { 273 if (delegate_->HandleExternalProtocol(this, redirect_info.new_url)) {
263 // The request is complete so we can remove it. 274 // The request is complete so we can remove it.
264 CancelAndIgnore(); 275 CancelAndIgnore();
265 return; 276 return;
266 } 277 }
267 278
268 scoped_refptr<ResourceResponse> response(new ResourceResponse()); 279 scoped_refptr<ResourceResponse> response(new ResourceResponse());
269 PopulateResourceResponse(info, request_.get(), response.get()); 280 PopulateResourceResponse(info, request_.get(), host_delegate_,
281 resource_context_, response.get());
270 if (!handler_->OnRequestRedirected(redirect_info, response.get(), defer)) { 282 if (!handler_->OnRequestRedirected(redirect_info, response.get(), defer)) {
271 Cancel(); 283 Cancel();
272 } else if (*defer) { 284 } else if (*defer) {
273 deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed. 285 deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed.
274 } 286 }
275 } 287 }
276 288
277 void ResourceLoader::OnAuthRequired(net::URLRequest* unused, 289 void ResourceLoader::OnAuthRequired(net::URLRequest* unused,
278 net::AuthChallengeInfo* auth_info) { 290 net::AuthChallengeInfo* auth_info) {
279 DCHECK_EQ(request_.get(), unused); 291 DCHECK_EQ(request_.get(), unused);
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 // this request. 543 // this request.
532 base::ThreadTaskRunnerHandle::Get()->PostTask( 544 base::ThreadTaskRunnerHandle::Get()->PostTask(
533 FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted, 545 FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted,
534 weak_ptr_factory_.GetWeakPtr())); 546 weak_ptr_factory_.GetWeakPtr()));
535 } 547 }
536 } 548 }
537 549
538 void ResourceLoader::CompleteResponseStarted() { 550 void ResourceLoader::CompleteResponseStarted() {
539 ResourceRequestInfoImpl* info = GetRequestInfo(); 551 ResourceRequestInfoImpl* info = GetRequestInfo();
540 scoped_refptr<ResourceResponse> response(new ResourceResponse()); 552 scoped_refptr<ResourceResponse> response(new ResourceResponse());
541 PopulateResourceResponse(info, request_.get(), response.get()); 553 PopulateResourceResponse(info, request_.get(), host_delegate_,
554 resource_context_, response.get());
542 555
543 delegate_->DidReceiveResponse(this); 556 delegate_->DidReceiveResponse(this);
544 557
545 // TODO(darin): Remove ScopedTracker below once crbug.com/475761 is fixed. 558 // TODO(darin): Remove ScopedTracker below once crbug.com/475761 is fixed.
546 tracked_objects::ScopedTracker tracking_profile( 559 tracked_objects::ScopedTracker tracking_profile(
547 FROM_HERE_WITH_EXPLICIT_FUNCTION("475761 OnResponseStarted()")); 560 FROM_HERE_WITH_EXPLICIT_FUNCTION("475761 OnResponseStarted()"));
548 561
549 bool defer = false; 562 bool defer = false;
550 if (!handler_->OnResponseStarted(response.get(), &defer)) { 563 if (!handler_->OnResponseStarted(response.get(), &defer)) {
551 Cancel(); 564 Cancel();
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 case net::URLRequestStatus::FAILED: 723 case net::URLRequestStatus::FAILED:
711 status = STATUS_UNDEFINED; 724 status = STATUS_UNDEFINED;
712 break; 725 break;
713 } 726 }
714 727
715 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 728 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
716 } 729 }
717 } 730 }
718 731
719 } // namespace content 732 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698