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"
@@ skipping 64 matching lines @@
     // "An opaque filtered response is a filtered response whose type is
     // |opaque|, status is 0, status message is the empty byte sequence, header
     // 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) {
+    if (m_internalResponse)
         m_internalResponse->populateWebServiceWorkerResponse(response);
+
+    WebServiceWorkerResponse::ResponseType type = WebServiceWorkerResponse::DefaultType;
+    switch (m_type) {
+    case BasicType:
+        type = WebServiceWorkerResponse::BasicType;
+        break;
+    case CORSType:
+        type = WebServiceWorkerResponse::CORSType;
+        break;
+    case DefaultType:
+        type = WebServiceWorkerResponse::DefaultType;
+        break;
+    case ErrorType:
+        type = WebServiceWorkerResponse::ErrorType;
+        break;
+    case OpaqueType:
+        type = WebServiceWorkerResponse::OpaqueType;
+        break;
+    }
+
+    // Note that this overrides any internal response's type.
+    response.setResponseType(type);
+
+    if (m_internalResponse)

[jsbell, 2014/09/30 22:14:44]

Splitting up the m_internalResponse logic (populate from it, then return early)
seems a bit fragile in case of further modifications to the code. How about
moving the response type conversion up to the top (and/or into a helper
function) and making this read:

if (m_internalResponse) {
  m_internalResponse->populateWebServiceWorkerResponse(response);
  // Override any internal response's type.
  response.setResponseType(type);
  return;
}

response.setResponseType(type);
...

That duplicates the setResponseType() call, so I dunno if this is an
improvement, bit it seems (to me) to simplify the code flow a bit.

[jkarlin, 2014/10/01 00:11:00]

Done.

         return;
-    }
+
     response.setURL(url());
     response.setStatus(status());
     response.setStatusText(statusMessage());
     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