Revert of [ServivceWorker] Treat rejecting respondWith as a Network Error

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"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/modules/v8/V8Response.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
-#include "public/platform/WebServiceWorkerResponse.h"
 #include "wtf/Assertions.h"
 #include "wtf/RefPtr.h"
 #include <v8.h>
 
 namespace blink {
 
 class RespondWithObserver::ThenFunction FINAL : public ScriptFunction {
 public:
     enum ResolveType {
         Fulfilled,
@@ skipping 42 matching lines @@
 }
 
 void RespondWithObserver::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
     m_state = Done;
 }
 
 void RespondWithObserver::didDispatchEvent()
 {
-    ASSERT(executionContext());
-    if (m_state != Initial)
-        return;
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID);
-    m_state = Done;
+    if (m_state == Initial)
+        sendResponse(nullptr);
 }
 
 void RespondWithObserver::respondWith(ScriptState* scriptState, const ScriptValue& value, ExceptionState& exceptionState)
 {
     if (m_state != Initial) {
         exceptionState.throwDOMException(InvalidStateError, "respondWith is already called.");
         return;
     }
 
     m_state = Pending;
     ScriptPromise::cast(scriptState, value).then(
         ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled),
         ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected));
 }
 
+void RespondWithObserver::sendResponse(Response* response)
+{
+    if (!executionContext())
+        return;
+    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID, response);
+    m_state = Done;
+}
+
 void RespondWithObserver::responseWasRejected()
 {
-    ASSERT(executionContext());
-    // The default value of WebServiceWorkerResponse's status is 0, which maps
-    // to a network error.
-    WebServiceWorkerResponse webResponse;
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID, webResponse);
-    m_state = Done;
+    // FIXME: Throw a NetworkError to service worker's execution context.
+    sendResponse(nullptr);
 }
 
 void RespondWithObserver::responseWasFulfilled(const ScriptValue& value)
 {
-    ASSERT(executionContext());
+    if (!executionContext())
+        return;
     if (!V8Response::hasInstance(value.v8Value(), toIsolate(executionContext()))) {
         responseWasRejected();
         return;
     }
-    WebServiceWorkerResponse webResponse;
-    V8Response::toImplWithTypeCheck(toIsolate(executionContext()), value.v8Value())->populateWebServiceWorkerResponse(webResponse);
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID, webResponse);
-    m_state = Done;
+    v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value.v8Value());
+    sendResponse(V8Response::toImpl(object));
 }
 
 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID)
     : ContextLifecycleObserver(context)
     , m_eventID(eventID)
     , m_state(Initial)
 {
 }
 
 } // namespace blink