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/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/resource_loader_delegate.h" | 14 #include "content/browser/loader/resource_loader_delegate.h" |
13 #include "content/browser/loader/resource_request_info_impl.h" | 15 #include "content/browser/loader/resource_request_info_impl.h" |
14 #include "content/browser/ssl/ssl_client_auth_handler.h" | 16 #include "content/browser/ssl/ssl_client_auth_handler.h" |
15 #include "content/browser/ssl/ssl_manager.h" | 17 #include "content/browser/ssl/ssl_manager.h" |
16 #include "content/common/ssl_status_serialization.h" | 18 #include "content/common/ssl_status_serialization.h" |
17 #include "content/public/browser/cert_store.h" | 19 #include "content/public/browser/cert_store.h" |
18 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" | 20 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" |
19 #include "content/public/browser/site_instance.h" | 21 #include "content/public/browser/site_instance.h" |
20 #include "content/public/common/content_client.h" | 22 #include "content/public/common/content_client.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 request, | 57 request, |
56 &response->head.appcache_id, | 58 &response->head.appcache_id, |
57 &response->head.appcache_manifest_url); | 59 &response->head.appcache_manifest_url); |
58 // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove. | 60 // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove. |
59 if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING) | 61 if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING) |
60 request->GetLoadTimingInfo(&response->head.load_timing); | 62 request->GetLoadTimingInfo(&response->head.load_timing); |
61 } | 63 } |
62 | 64 |
63 } // namespace | 65 } // namespace |
64 | 66 |
67 int ResourceLoader::default_delay_prefetch_cancel_ms_ = 60000; | |
68 | |
65 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, | 69 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, |
66 scoped_ptr<ResourceHandler> handler, | 70 scoped_ptr<ResourceHandler> handler, |
67 ResourceLoaderDelegate* delegate) | 71 ResourceLoaderDelegate* delegate) |
68 : weak_ptr_factory_(this) { | 72 : weak_ptr_factory_(this) { |
69 scoped_ptr<net::ClientCertStore> client_cert_store; | 73 scoped_ptr<net::ClientCertStore> client_cert_store; |
70 #if !defined(USE_OPENSSL) | 74 #if !defined(USE_OPENSSL) |
71 client_cert_store.reset(new net::ClientCertStoreImpl()); | 75 client_cert_store.reset(new net::ClientCertStoreImpl()); |
72 #endif | 76 #endif |
73 Init(request.Pass(), handler.Pass(), delegate, client_cert_store.Pass()); | 77 Init(request.Pass(), handler.Pass(), delegate, client_cert_store.Pass()); |
74 } | 78 } |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
449 CancelRequest(false); | 453 CancelRequest(false); |
450 } | 454 } |
451 | 455 |
452 void ResourceLoader::StartRequestInternal() { | 456 void ResourceLoader::StartRequestInternal() { |
453 DCHECK(!request_->is_pending()); | 457 DCHECK(!request_->is_pending()); |
454 request_->Start(); | 458 request_->Start(); |
455 | 459 |
456 delegate_->DidStartRequest(this); | 460 delegate_->DidStartRequest(this); |
457 } | 461 } |
458 | 462 |
463 bool ResourceLoader::DelayCancelForPrefetch(const ResourceRequestInfoImpl& info, | |
464 bool from_renderer) { | |
465 // Delay requests to cancel prefetches | |
466 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | |
467 if (from_renderer && | |
468 command_line.HasSwitch(switches::kDelayPrefetchCancellation) && | |
469 info.GetResourceType() == ResourceType::PREFETCH) { | |
mmenke
2013/10/08 14:50:54
Know it doesn't really matter, but seems like chec
jkarlin2
2013/10/09 14:44:33
Done.
| |
470 if (prefetch_timer_.get() && prefetch_timer_->IsRunning()) { | |
mmenke
2013/10/08 14:50:54
If something is impossible, should we be checking
jkarlin2
2013/10/09 14:44:33
Done.
| |
471 // We've already processed a cancel for this prefetch, ignore this cancel. | |
472 return true; | |
473 } else if (!prefetch_timer_.get()) { | |
mmenke
2013/10/08 14:50:54
nit: Here and just above, believe "if (!prefetch_
| |
474 // Our first call to cancel this prefetch, start a delay timer. | |
475 prefetch_timer_.reset(new base::OneShotTimer<ResourceLoader>()); | |
476 | |
477 int delay_ms; | |
478 if (!base::StringToInt(command_line.GetSwitchValueASCII( | |
479 switches::kDelayPrefetchCancellation), | |
480 &delay_ms)) { | |
481 delay_ms = default_delay_prefetch_cancel_ms_; | |
482 } | |
483 | |
484 prefetch_timer_->Start(FROM_HERE, TimeDelta::FromMilliseconds(delay_ms), | |
485 this, &ResourceLoader::Cancel); | |
486 return true; | |
487 } | |
488 } | |
489 return false; | |
490 } | |
491 | |
459 void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) { | 492 void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) { |
460 VLOG(1) << "CancelRequestInternal: " << request_->url().spec(); | 493 VLOG(1) << "CancelRequestInternal: " << request_->url().spec(); |
461 | 494 |
462 ResourceRequestInfoImpl* info = GetRequestInfo(); | 495 ResourceRequestInfoImpl* info = GetRequestInfo(); |
463 | 496 |
464 // WebKit will send us a cancel for downloads since it no longer handles | 497 // WebKit will send us a cancel for downloads since it no longer handles |
465 // them. In this case, ignore the cancel since we handle downloads in the | 498 // them. In this case, ignore the cancel since we handle downloads in the |
466 // browser. | 499 // browser. |
467 if (from_renderer && (info->is_download() || info->is_stream())) | 500 if (from_renderer && (info->is_download() || info->is_stream())) |
468 return; | 501 return; |
469 | 502 |
503 if (DelayCancelForPrefetch(*info, from_renderer)) { | |
504 return; | |
505 } | |
506 | |
470 // TODO(darin): Perhaps we should really be looking to see if the status is | 507 // TODO(darin): Perhaps we should really be looking to see if the status is |
471 // IO_PENDING? | 508 // IO_PENDING? |
472 bool was_pending = request_->is_pending(); | 509 bool was_pending = request_->is_pending(); |
473 | 510 |
474 if (login_delegate_.get()) { | 511 if (login_delegate_.get()) { |
475 login_delegate_->OnRequestCancelled(); | 512 login_delegate_->OnRequestCancelled(); |
476 login_delegate_ = NULL; | 513 login_delegate_ = NULL; |
477 } | 514 } |
478 if (ssl_client_auth_handler_.get()) { | 515 if (ssl_client_auth_handler_.get()) { |
479 ssl_client_auth_handler_->OnRequestCancelled(); | 516 ssl_client_auth_handler_->OnRequestCancelled(); |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
648 // we resume. | 685 // we resume. |
649 deferred_stage_ = DEFERRED_FINISH; | 686 deferred_stage_ = DEFERRED_FINISH; |
650 } | 687 } |
651 } | 688 } |
652 | 689 |
653 void ResourceLoader::CallDidFinishLoading() { | 690 void ResourceLoader::CallDidFinishLoading() { |
654 delegate_->DidFinishLoading(this); | 691 delegate_->DidFinishLoading(this); |
655 } | 692 } |
656 | 693 |
657 } // namespace content | 694 } // namespace content |
OLD | NEW |