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

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

Issue 25772002: Allows prefetch requests to live beyond the renderer by delaying (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 1 month 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string_number_conversions.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "base/timer/timer.h"
11 #include "content/browser/child_process_security_policy_impl.h" 13 #include "content/browser/child_process_security_policy_impl.h"
12 #include "content/browser/loader/cross_site_resource_handler.h" 14 #include "content/browser/loader/cross_site_resource_handler.h"
13 #include "content/browser/loader/resource_loader_delegate.h" 15 #include "content/browser/loader/resource_loader_delegate.h"
14 #include "content/browser/loader/resource_request_info_impl.h" 16 #include "content/browser/loader/resource_request_info_impl.h"
15 #include "content/browser/ssl/ssl_client_auth_handler.h" 17 #include "content/browser/ssl/ssl_client_auth_handler.h"
16 #include "content/browser/ssl/ssl_manager.h" 18 #include "content/browser/ssl/ssl_manager.h"
17 #include "content/common/ssl_status_serialization.h" 19 #include "content/common/ssl_status_serialization.h"
18 #include "content/public/browser/cert_store.h" 20 #include "content/public/browser/cert_store.h"
19 #include "content/public/browser/resource_context.h" 21 #include "content/public/browser/resource_context.h"
20 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" 22 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
21 #include "content/public/browser/site_instance.h" 23 #include "content/public/browser/site_instance.h"
22 #include "content/public/common/content_client.h" 24 #include "content/public/common/content_client.h"
23 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
24 #include "content/public/common/process_type.h" 26 #include "content/public/common/process_type.h"
25 #include "content/public/common/resource_response.h" 27 #include "content/public/common/resource_response.h"
26 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
27 #include "net/base/io_buffer.h" 29 #include "net/base/io_buffer.h"
28 #include "net/base/load_flags.h" 30 #include "net/base/load_flags.h"
29 #include "net/http/http_response_headers.h" 31 #include "net/http/http_response_headers.h"
30 #include "net/ssl/client_cert_store.h" 32 #include "net/ssl/client_cert_store.h"
31 #include "webkit/browser/appcache/appcache_interceptor.h" 33 #include "webkit/browser/appcache/appcache_interceptor.h"
32 34
33 using base::TimeDelta; 35 using base::TimeDelta;
34 using base::TimeTicks; 36 using base::TimeTicks;
35 37
36 namespace content { 38 namespace content {
37 namespace { 39 namespace {
38 40
41 // TODO(jkarlin): The value is high to reduce the chance of the detachable
42 // request timing out, forcing a blocked second request to open a new connection
43 // and start over. Reduce this value once we have a better idea of what it
44 // should be and once we stop blocking multiple simultaneous requests for the
45 // same resource (see bugs 46104 and 31014).
46 const int kDefaultDetachableDelayOnCancelMs = 30000;
47
39 void PopulateResourceResponse(net::URLRequest* request, 48 void PopulateResourceResponse(net::URLRequest* request,
40 ResourceResponse* response) { 49 ResourceResponse* response) {
41 response->head.error_code = request->status().error(); 50 response->head.error_code = request->status().error();
42 response->head.request_time = request->request_time(); 51 response->head.request_time = request->request_time();
43 response->head.response_time = request->response_time(); 52 response->head.response_time = request->response_time();
44 response->head.headers = request->response_headers(); 53 response->head.headers = request->response_headers();
45 request->GetCharset(&response->head.charset); 54 request->GetCharset(&response->head.charset);
46 response->head.content_length = request->GetExpectedContentSize(); 55 response->head.content_length = request->GetExpectedContentSize();
47 request->GetMimeType(&response->head.mime_type); 56 request->GetMimeType(&response->head.mime_type);
48 net::HttpResponseInfo response_info = request->response_info(); 57 net::HttpResponseInfo response_info = request->response_info();
(...skipping 18 matching lines...) Expand all
67 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 76 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
68 scoped_ptr<ResourceHandler> handler, 77 scoped_ptr<ResourceHandler> handler,
69 ResourceLoaderDelegate* delegate) 78 ResourceLoaderDelegate* delegate)
70 : deferred_stage_(DEFERRED_NONE), 79 : deferred_stage_(DEFERRED_NONE),
71 request_(request.Pass()), 80 request_(request.Pass()),
72 handler_(handler.Pass()), 81 handler_(handler.Pass()),
73 delegate_(delegate), 82 delegate_(delegate),
74 last_upload_position_(0), 83 last_upload_position_(0),
75 waiting_for_upload_progress_ack_(false), 84 waiting_for_upload_progress_ack_(false),
76 is_transferring_(false), 85 is_transferring_(false),
86 detachable_delay_on_cancel_ms_(kDefaultDetachableDelayOnCancelMs),
77 weak_ptr_factory_(this) { 87 weak_ptr_factory_(this) {
78 request_->set_delegate(this); 88 request_->set_delegate(this);
79 handler_->SetController(this); 89 handler_->SetController(this);
80 } 90 }
81 91
82 ResourceLoader::~ResourceLoader() { 92 ResourceLoader::~ResourceLoader() {
83 if (login_delegate_.get()) 93 if (login_delegate_.get())
84 login_delegate_->OnRequestCancelled(); 94 login_delegate_->OnRequestCancelled();
85 if (ssl_client_auth_handler_.get()) 95 if (ssl_client_auth_handler_.get())
86 ssl_client_auth_handler_->OnRequestCancelled(); 96 ssl_client_auth_handler_->OnRequestCancelled();
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 CancelRequest(false); 432 CancelRequest(false);
423 } 433 }
424 434
425 void ResourceLoader::StartRequestInternal() { 435 void ResourceLoader::StartRequestInternal() {
426 DCHECK(!request_->is_pending()); 436 DCHECK(!request_->is_pending());
427 request_->Start(); 437 request_->Start();
428 438
429 delegate_->DidStartRequest(this); 439 delegate_->DidStartRequest(this);
430 } 440 }
431 441
442 void ResourceLoader::Detach() {
443 ResourceRequestInfoImpl* info = GetRequestInfo();
444
445 if (info->is_detached())
446 return;
447 info->set_detached();
448 detached_timer_.reset(new base::OneShotTimer<ResourceLoader>());
449 detached_timer_->Start(
450 FROM_HERE, TimeDelta::FromMilliseconds(detachable_delay_on_cancel_ms_),
451 this, &ResourceLoader::Cancel);
452 }
453
432 void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) { 454 void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) {
433 VLOG(1) << "CancelRequestInternal: " << request_->url().spec(); 455 VLOG(1) << "CancelRequestInternal: " << request_->url().spec();
434 456
435 ResourceRequestInfoImpl* info = GetRequestInfo(); 457 ResourceRequestInfoImpl* info = GetRequestInfo();
436 458
437 // WebKit will send us a cancel for downloads since it no longer handles 459 // WebKit will send us a cancel for downloads since it no longer handles
438 // them. In this case, ignore the cancel since we handle downloads in the 460 // them. In this case, ignore the cancel since we handle downloads in the
439 // browser. 461 // browser.
440 if (from_renderer && (info->is_download() || info->is_stream())) 462 if (from_renderer && (info->is_download() || info->is_stream()))
441 return; 463 return;
442 464
465 if (from_renderer && info->is_detachable()) {
466 Detach();
467 return;
468 }
469
443 // TODO(darin): Perhaps we should really be looking to see if the status is 470 // TODO(darin): Perhaps we should really be looking to see if the status is
444 // IO_PENDING? 471 // IO_PENDING?
445 bool was_pending = request_->is_pending(); 472 bool was_pending = request_->is_pending();
446 473
447 if (login_delegate_.get()) { 474 if (login_delegate_.get()) {
448 login_delegate_->OnRequestCancelled(); 475 login_delegate_->OnRequestCancelled();
449 login_delegate_ = NULL; 476 login_delegate_ = NULL;
450 } 477 }
451 if (ssl_client_auth_handler_.get()) { 478 if (ssl_client_auth_handler_.get()) {
452 ssl_client_auth_handler_->OnRequestCancelled(); 479 ssl_client_auth_handler_->OnRequestCancelled();
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 // we resume. 651 // we resume.
625 deferred_stage_ = DEFERRED_FINISH; 652 deferred_stage_ = DEFERRED_FINISH;
626 } 653 }
627 } 654 }
628 655
629 void ResourceLoader::CallDidFinishLoading() { 656 void ResourceLoader::CallDidFinishLoading() {
630 delegate_->DidFinishLoading(this); 657 delegate_->DidFinishLoading(this);
631 } 658 }
632 659
633 } // namespace content 660 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_loader.h ('k') | content/browser/loader/resource_request_info_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698