Make WebServiceWorkerResponse support ResponseType

Source/modules/serviceworkers/FetchResponseData.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 "FetchResponseData.h"
 
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "modules/serviceworkers/FetchHeaderList.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 
 namespace blink {
 
+namespace {
+    WebServiceWorkerResponse::ResponseType fetchTypeToWebType(FetchResponseData::Type fetchType)

[horo, 2014/10/01 01:38:11]

+ 1 line

[horo, 2014/10/01 01:38:11]

No need to indent.

[jkarlin, 2014/10/01 11:26:57]

Done.

[jkarlin, 2014/10/01 11:26:57]

Done.

+    {
+        WebServiceWorkerResponse::ResponseType webType = WebServiceWorkerResponse::DefaultType;
+        switch (fetchType) {
+        case FetchResponseData::BasicType:
+            webType = WebServiceWorkerResponse::BasicType;
+            break;
+        case FetchResponseData::CORSType:
+            webType = WebServiceWorkerResponse::CORSType;
+            break;
+        case FetchResponseData::DefaultType:
+            webType = WebServiceWorkerResponse::DefaultType;
+            break;
+        case FetchResponseData::ErrorType:
+            webType = WebServiceWorkerResponse::ErrorType;
+            break;
+        case FetchResponseData::OpaqueType:
+            webType = WebServiceWorkerResponse::OpaqueType;
+            break;
+        }
+        return webType;
+    }
+
+} // namespace
+
 FetchResponseData* FetchResponseData::create()
 {
     // "Unless stated otherwise, a response's url is null, status is 200, status
     // message is `OK`, header list is an empty header list, and body is null."
     return new FetchResponseData(DefaultType, 200, "OK");
 }
 
 FetchResponseData* FetchResponseData::createNetworkErrorResponse()
 {
     // "A network error is a response whose status is always 0, status message
@@ skipping 53 matching lines @@
     // list is an empty list, and body is null."
     FetchResponseData* response = new FetchResponseData(OpaqueType, 0, "");
     response->m_internalResponse = this;
     return response;
 }
 
 void FetchResponseData::populateWebServiceWorkerResponse(WebServiceWorkerResponse& response)
 {
     if (m_internalResponse) {
         m_internalResponse->populateWebServiceWorkerResponse(response);
+        response.setResponseType(fetchTypeToWebType(m_type));
         return;
     }
+
     response.setURL(url());
     response.setStatus(status());
     response.setStatusText(statusMessage());
+    response.setResponseType(fetchTypeToWebType(m_type));
     for (size_t i = 0; i < headerList()->size(); ++i) {
         const FetchHeaderList::Header* header = headerList()->list()[i].get();
         response.appendHeader(header->first, header->second);
     }
     response.setBlobDataHandle(blobDataHandle());
 }
 
 FetchResponseData::FetchResponseData(Type type, unsigned short status, AtomicString statusMessage)
     : m_type(type)
     , m_status(status)
     , m_statusMessage(statusMessage)
     , m_headerList(FetchHeaderList::create())
 {
 }
 
 void FetchResponseData::trace(Visitor* visitor)
 {
     visitor->trace(m_headerList);
     visitor->trace(m_internalResponse);
 }
 
 } // namespace blink