Make WebServiceWorkerResponse support ResponseType

Source/modules/serviceworkers/Response.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "Response.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/fileapi/Blob.h"
@@ skipping 11 matching lines @@
 {
     FetchResponseData* response = 0;
     if (200 <= webResponse.status() && webResponse.status() < 300)
         response = FetchResponseData::create();
     else
         response = FetchResponseData::createNetworkErrorResponse();
 
     response->setURL(webResponse.url());
     response->setStatus(webResponse.status());
     response->setStatusMessage(webResponse.statusText());
+
+    for (HTTPHeaderMap::const_iterator i = webResponse.headers().begin(), end = webResponse.headers().end(); i != end; ++i) {
+        response->headerList()->append(i->key, i->value);
+    }
+
+    // Filter the response according to |webResponse|'s ResponseType.
+    switch (webResponse.responseType()) {
+    case WebServiceWorkerResponseTypeBasic:
+        response = response->createBasicFilteredResponse();
+        break;
+    case WebServiceWorkerResponseTypeCORS:
+        response = response->createCORSFilteredResponse();
+        break;
+    case WebServiceWorkerResponseTypeOpaque:
+        response = response->createOpaqueFilteredResponse();
+        break;
+    case WebServiceWorkerResponseTypeDefault:
+        break;
+    case WebServiceWorkerResponseTypeError:
+        ASSERT(response->type() == FetchResponseData::ErrorType);
+        break;
+    }
+
     return response;
 }
 
-Headers* createHeadersFromWebResponse(const WebServiceWorkerResponse& webResponse)
-{
-    Headers* headers = Headers::create();
-    TrackExceptionState exceptionState;
-    for (HTTPHeaderMap::const_iterator i = webResponse.headers().begin(), end = webResponse.headers().end(); i != end; ++i) {
-        headers->append(i->key, i->value, exceptionState);
-        if (exceptionState.hadException())
-            return 0;
-    }
-    return headers;
 }
-
-}
 
 Response* Response::create(ExecutionContext* context, Blob* body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
     return create(context, body, ResponseInit(responseInit), exceptionState);
 }
 
 Response* Response::create(ExecutionContext* context, const String& body, const Dictionary& responseInit, ExceptionState& exceptionState)
 {
     OwnPtr<BlobData> blobData = BlobData::create();
     blobData->appendText(body, false);
@@ skipping 84 matching lines @@
 
 Response* Response::create(ExecutionContext* context, FetchResponseData* response)
 {
     Response* r = new Response(context, response);
     r->suspendIfNeeded();
     return r;
 }
 
 Response* Response::create(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
 {
-    Response* r = new Response(context, webResponse);
+    // FIXME: Handle response body data.
+    FetchResponseData* responseData = createFetchResponseDataFromWebResponse(webResponse);
+    Response* r = new Response(context, responseData);
     r->suspendIfNeeded();
     return r;
 }
 
 Response* Response::create(const Response& copyFrom)
 {
     Response* r = new Response(copyFrom);
     r->suspendIfNeeded();
     return r;
 }
@@ skipping 73 matching lines @@
 }
 
 Response::Response(ExecutionContext* context, FetchResponseData* response)
     : Body(context)
     , m_response(response)
     , m_headers(Headers::create(m_response->headerList()))
 {
     m_headers->setGuard(Headers::ResponseGuard);
 }
 
-// FIXME: Handle response body data.
-Response::Response(ExecutionContext* context, const WebServiceWorkerResponse& webResponse)
-    : Body(context)
-    , m_response(createFetchResponseDataFromWebResponse(webResponse))
-    , m_headers(createHeadersFromWebResponse(webResponse))
-{
-    m_headers->setGuard(Headers::ResponseGuard);
-}
 
 PassRefPtr<BlobDataHandle> Response::blobDataHandle()
 {
     return m_response->blobDataHandle();
 }
 
 void Response::trace(Visitor* visitor)
 {
     Body::trace(visitor);
     visitor->trace(m_response);
     visitor->trace(m_headers);
 }
 
 } // namespace blink