Chromium Code Reviews| 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/location.h" | 8 #include "base/location.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 } | 242 } |
| 243 | 243 |
| 244 delegate_->DidReceiveRedirect(this, redirect_info.new_url); | 244 delegate_->DidReceiveRedirect(this, redirect_info.new_url); |
| 245 | 245 |
| 246 if (delegate_->HandleExternalProtocol(this, redirect_info.new_url)) { | 246 if (delegate_->HandleExternalProtocol(this, redirect_info.new_url)) { |
| 247 // The request is complete so we can remove it. | 247 // The request is complete so we can remove it. |
| 248 CancelAndIgnore(); | 248 CancelAndIgnore(); |
| 249 return; | 249 return; |
| 250 } | 250 } |
| 251 | 251 |
| 252 *defer = true; | |
| 253 deferred_stage_ = DEFERRED_REDIRECT; | |
| 254 base::ThreadTaskRunnerHandle::Get()->PostTask( | |
| 255 FROM_HERE, base::Bind(&ResourceLoader::Resume, | |
| 256 weak_ptr_factory_.GetWeakPtr())); | |
| 257 Cancel(); | |
| 258 if(true) | |
| 259 return; | |
|
xunjieli
2015/07/10 20:32:25
I don't understand why this block is almost identi
mmenke
2015/07/10 21:37:31
Hrm...This shouldn't be in this CL. Was investiga
| |
| 260 | |
| 252 scoped_refptr<ResourceResponse> response(new ResourceResponse()); | 261 scoped_refptr<ResourceResponse> response(new ResourceResponse()); |
| 253 PopulateResourceResponse(info, request_.get(), response.get()); | 262 PopulateResourceResponse(info, request_.get(), response.get()); |
| 254 if (!handler_->OnRequestRedirected(redirect_info, response.get(), defer)) { | 263 if (!handler_->OnRequestRedirected(redirect_info, response.get(), defer)) { |
| 255 Cancel(); | 264 Cancel(); |
| 256 } else if (*defer) { | 265 } else if (*defer) { |
| 257 deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed. | 266 deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed. |
| 267 } else { | |
| 268 *defer = true; | |
| 269 deferred_stage_ = DEFERRED_REDIRECT; | |
| 270 base::ThreadTaskRunnerHandle::Get()->PostTask( | |
| 271 FROM_HERE, base::Bind(&ResourceLoader::Resume, | |
| 272 weak_ptr_factory_.GetWeakPtr())); | |
| 273 Cancel(); | |
| 258 } | 274 } |
| 259 } | 275 } |
| 260 | 276 |
| 261 void ResourceLoader::OnAuthRequired(net::URLRequest* unused, | 277 void ResourceLoader::OnAuthRequired(net::URLRequest* unused, |
| 262 net::AuthChallengeInfo* auth_info) { | 278 net::AuthChallengeInfo* auth_info) { |
| 263 DCHECK_EQ(request_.get(), unused); | 279 DCHECK_EQ(request_.get(), unused); |
| 264 | 280 |
| 265 ResourceRequestInfoImpl* info = GetRequestInfo(); | 281 ResourceRequestInfoImpl* info = GetRequestInfo(); |
| 266 if (info->do_not_prompt_for_login()) { | 282 if (info->do_not_prompt_for_login()) { |
| 267 request_->CancelAuth(); | 283 request_->CancelAuth(); |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 767 case net::URLRequestStatus::FAILED: | 783 case net::URLRequestStatus::FAILED: |
| 768 status = STATUS_UNDEFINED; | 784 status = STATUS_UNDEFINED; |
| 769 break; | 785 break; |
| 770 } | 786 } |
| 771 | 787 |
| 772 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 788 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
| 773 } | 789 } |
| 774 } | 790 } |
| 775 | 791 |
| 776 } // namespace content | 792 } // namespace content |
| OLD | NEW |