[ServiceWorker] Treat cors response as a network error for client requests.

Source/modules/serviceworkers/RespondWithObserver.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 "modules/serviceworkers/RespondWithObserver.h"
 
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
@@ skipping 167 matching lines @@
 }
 
 void RespondWithObserver::responseWasFulfilled(const ScriptValue& value)
 {
     ASSERT(executionContext());
     if (!V8Response::hasInstance(value.v8Value(), toIsolate(executionContext()))) {
         responseWasRejected();
         return;
     }
     Response* response = V8Response::toImplWithTypeCheck(toIsolate(executionContext()), value.v8Value());
-    // "If either |response|'s type is |opaque| and |request|'s mode is not
-    // |no CORS| or |response|'s type is |error|, return a network error."
+    // "If one of the following conditions is true, return a network error:
+    //   - |response|'s type is |error|.
+    //   - |request|'s mode is not |no-cors| and response's type is |opaque|.
+    //   - |request| is a client request and |response|'s type is neither
+    //     |basic| nor |default|."
     const FetchResponseData::Type responseType = response->response()->type();
-    if ((responseType == FetchResponseData::OpaqueType && m_requestMode != WebURLRequest::FetchRequestModeNoCORS) || responseType == FetchResponseData::ErrorType) {
+    if (responseType == FetchResponseData::ErrorType || (m_requestMode != WebURLRequest::FetchRequestModeNoCORS && responseType == FetchResponseData::OpaqueType) || (m_frameType != WebURLRequest::FrameTypeNone && responseType != FetchResponseData::BasicType && responseType != FetchResponseData::DefaultType)) {

[falken, 2015/04/15 06:14:24]

it may be time to wrap this line :)

         responseWasRejected();
         return;
     }
-    // Treat the opaque response as a network error for frame loading.
-    if (responseType == FetchResponseData::OpaqueType && m_frameType != WebURLRequest::FrameTypeNone) {
-        responseWasRejected();
-        return;
-    }
     if (response->bodyUsed()) {
         responseWasRejected();
         return;
     }
     response->lockBody(Body::PassBody);
     if (BodyStreamBuffer* buffer = response->internalBuffer()) {
         if (buffer == response->buffer() && response->isBodyConsumed())
             buffer = response->createDrainingStream();
         WebServiceWorkerResponse webResponse;
         response->populateWebServiceWorkerResponse(webResponse);
@@ skipping 19 matching lines @@
     , m_state(Initial)
 {
 }
 
 DEFINE_TRACE(RespondWithObserver)
 {
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink