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

Unified Diff: Source/modules/fetch/FetchManager.cpp

Issue 1265133002: [1/3 blink] Support redirect option of Request and "opaqueredirect" response type. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « no previous file | Source/modules/fetch/FetchRequestData.h » ('j') | Source/modules/fetch/FetchResponseData.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/fetch/FetchManager.cpp
diff --git a/Source/modules/fetch/FetchManager.cpp b/Source/modules/fetch/FetchManager.cpp
index 634370cc1daf4525dcf6ac9b0528a77a25634745..0807bd70091aa9254759674d9437f34663569bb6 100644
--- a/Source/modules/fetch/FetchManager.cpp
+++ b/Source/modules/fetch/FetchManager.cpp
@@ -37,6 +37,15 @@
namespace blink {
+namespace {
+
+bool IsRedirectStatusCode(int statusCode)
+{
+ return (statusCode == 301 || statusCode == 302 || statusCode == 303 || statusCode == 307 || statusCode == 308);
+}
+
+} // namespace
+
class FetchManager::Loader final : public NoBaseWillBeGarbageCollectedFinalized<FetchManager::Loader>, public ThreadableLoaderClient, public ContextLifecycleObserver {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FetchManager::Loader);
public:
@@ -131,16 +140,21 @@ void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceRespo
responseData->setMIMEType(response.mimeType());
FetchResponseData* taintedResponse = responseData;
falken 2015/08/07 07:39:12 Should this be initialized to nullptr? It looks li
horo 2015/08/07 09:19:33 Done. I changed these code to fix the layout test
- switch (m_request->tainting()) {
- case FetchRequestData::BasicTainting:
- taintedResponse = responseData->createBasicFilteredResponse();
- break;
- case FetchRequestData::CORSTainting:
- taintedResponse = responseData->createCORSFilteredResponse();
- break;
- case FetchRequestData::OpaqueTainting:
- taintedResponse = responseData->createOpaqueFilteredResponse();
- break;
+
+ if (IsRedirectStatusCode(m_responseHttpStatusCode)) {
yhirano 2015/08/07 14:22:02 ASSERT(redirect mode is "manual")?
horo 2015/08/07 15:39:53 Done.
+ taintedResponse = responseData->createOpaqueRedirectFilteredResponse();
+ } else {
+ switch (m_request->tainting()) {
+ case FetchRequestData::BasicTainting:
+ taintedResponse = responseData->createBasicFilteredResponse();
+ break;
+ case FetchRequestData::CORSTainting:
+ taintedResponse = responseData->createCORSFilteredResponse();
+ break;
+ case FetchRequestData::OpaqueTainting:
+ taintedResponse = responseData->createOpaqueFilteredResponse();
+ break;
+ }
}
Response* r = Response::create(m_resolver->executionContext(), taintedResponse);
r->headers()->setGuard(Headers::ImmutableGuard);
@@ -335,7 +349,7 @@ void FetchManager::Loader::performHTTPFetch(bool corsFlag, bool corsPreflightFla
request.setHTTPBody(httpBody);
}
}
-
+ request.setFetchRedirectMode(m_request->redirect());
request.setUseStreamOnResponse(true);
// "2. Append `Referer`/empty byte sequence, if |HTTPRequest|'s |referrer|
« no previous file with comments | « no previous file | Source/modules/fetch/FetchRequestData.h » ('j') | Source/modules/fetch/FetchResponseData.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698