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

Unified Diff: content/browser/loader/resource_loader.cc

Issue 1271733002: [2/3 chromium] Support redirect option of Request and "opaqueredirect" response type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated mmenke's comment Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 0339cf11c0d5ade2f2f4ebe14a64cd3da4289c3b..61df345181c4f36934833a24a17e9b638ce76387 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -280,6 +280,28 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
return;
}
+ if (info->fetch_redirect_mode() == FETCH_REDIRECT_MODE_ERROR) {
+ Cancel();
+ return;
+ } else if (info->fetch_redirect_mode() == FETCH_REDIRECT_MODE_MANUAL) {
+ // TODO(horo): If we will support upload progress events for Fetch API, we
mmenke 2015/08/11 16:06:14 nit: will -> "are going to" (Or just remove "wil
horo 2015/08/11 16:43:55 Done.
+ // will have to call ReportUploadProgress().
+ DCHECK(!GetRequestInfo()->is_upload_progress_enabled());
+
+ CompleteResponseStarted();
+ DCHECK(!is_deferred());
mmenke 2015/08/11 16:06:14 Oh...I completely misunderstood this deferred stuf
horo 2015/08/11 16:43:55 I added is_redirect_response argument to CompleteR
+
+ // There is no need to read the response body here because there is no way
+ // to read the body of opaque-redirect filtered response's internal
+ // response.
+ // TODO(horo): If we will support any API which expose the internal body,
mmenke 2015/08/11 16:06:14 nit: will -> "are going to" (Or just remove "wil
horo 2015/08/11 16:43:55 Done.
+ // we will have to read the body before calling ResponseCompleted(). And
+ // also Cache changes will be needed because it doesn't store the body of
+ // redirect responses.
+ ResponseCompleted();
+ return;
+ }
+
delegate_->DidReceiveRedirect(this, redirect_info.new_url);
if (delegate_->HandleExternalProtocol(this, redirect_info.new_url)) {
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_unittest.cc ('k') | content/browser/loader/resource_request_info_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698