Revert of [ServivceWorker] Treat rejecting respondWith as a Network E…

…rror (patchset #4 id:60001 of https://codereview.chromium.org/571843003/)

Reason for revert:
WebServiceWorkerResponse's status is not initialised.
This may cause problems.

I will re-land this patch after https://codereview.chromium.org/575153002/ is submitted.

Original issue's description:
> [ServivceWorker] Treat rejecting respondWith as a Network Error
> 
> Chromium side change is this: https://codereview.chromium.org/574643003/
> 
> 
> BUG=411173
> TEST=layouttest http/tests/serviceworker/
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182147

[email protected],[email protected],[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=411173

Review URL: https://codereview.chromium.org/580993002

git-svn-id: svn://svn.chromium.org/blink/trunk@182204 bbb929c8-8fbe-4397-9dbb-9b2b20218538

LayoutTests/http/tests/serviceworker/fetch-event.html

@@ -105,8 +105,8 @@
       .then(function() { return with_iframe(scope); })
       .then(function(frame) {
           assert_equals(frame.contentDocument.body.textContent,
-                        '',
-                        'Response should be a NetworkError');
+                        'Here\'s a simple html file.\n',
+                        'Response should come from fallback to native fetch');
           unload_iframe(frame);
           return service_worker_unregister_and_done(t, scope);
         })

Source/modules/serviceworkers/RespondWithObserver.cpp

@@ -12,7 +12,6 @@
 #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>
@@ -75,11 +74,8 @@ void RespondWithObserver::contextDestroyed()
 
 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)
@@ -95,27 +91,30 @@ void RespondWithObserver::respondWith(ScriptState* scriptState, const ScriptValu
         ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected));
 }
 
-void RespondWithObserver::responseWasRejected()
+void RespondWithObserver::sendResponse(Response* response)
 {
-    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);
+    if (!executionContext())
+        return;
+    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEvent(m_eventID, response);
     m_state = Done;
 }
 
+void RespondWithObserver::responseWasRejected()
+{
+    // 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)

Source/modules/serviceworkers/RespondWithObserver.h

@@ -42,6 +42,10 @@ class RespondWithObserver FINAL : public GarbageCollectedFinalized<RespondWithOb
 
     RespondWithObserver(ExecutionContext*, int eventID);
 
+    // Sends a response back to the client. The null response means to fallback
+    // to native.
+    void sendResponse(Response*);
+
     int m_eventID;
 
     enum State { Initial, Pending, Done };

Source/modules/serviceworkers/ServiceWorkerGlobalScopeClient.h

@@ -43,8 +43,8 @@
 namespace blink {
 
 class ExecutionContext;
+class Response;
 class WebServiceWorkerCacheStorage;
-class WebServiceWorkerResponse;
 class WebURL;
 class WorkerClients;
 
@@ -59,10 +59,8 @@ class ServiceWorkerGlobalScopeClient : public WillBeHeapSupplement<WorkerClients
 
     virtual void didHandleActivateEvent(int eventID, WebServiceWorkerEventResult) = 0;
     virtual void didHandleInstallEvent(int installEventID, WebServiceWorkerEventResult) = 0;
-    // Calling didHandleFetchEvent without response means no response was
-    // provided by the service worker in the fetch events, so fallback to native.
-    virtual void didHandleFetchEvent(int fetchEventID) = 0;
-    virtual void didHandleFetchEvent(int fetchEventID, const WebServiceWorkerResponse&) = 0;
+    // A null response means no valid response was provided by the service worker, so fallback to native.
+    virtual void didHandleFetchEvent(int fetchEventID, Response* = 0) = 0;
     virtual void didHandleSyncEvent(int syncEventID) = 0;
     virtual void postMessageToClient(int clientID, const WebString& message, PassOwnPtr<WebMessagePortChannelArray>) = 0;
 

Source/web/ServiceWorkerGlobalScopeClientImpl.cpp

@@ -74,13 +74,20 @@ void ServiceWorkerGlobalScopeClientImpl::didHandleInstallEvent(int installEventI
     m_client.didHandleInstallEvent(installEventID, result);
 }
 
-void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID)
-{
-    m_client.didHandleFetchEvent(fetchEventID);
-}
-
-void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID, const WebServiceWorkerResponse& webResponse)
+void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID, Response* response)
 {
+    if (!response) {
+        m_client.didHandleFetchEvent(fetchEventID);
+        return;
+    }
+
+    WebServiceWorkerResponse webResponse;
+    response->populateWebServiceWorkerResponse(webResponse);
+    if (webResponse.status() == 0) {
+        // The status code is 0 means a network error.
+        m_client.didHandleFetchEvent(fetchEventID);
+        return;
+    }
     m_client.didHandleFetchEvent(fetchEventID, webResponse);
 }
 

Source/web/ServiceWorkerGlobalScopeClientImpl.h

@@ -38,7 +38,6 @@
 namespace blink {
 
 class WebServiceWorkerContextClient;
-class WebServiceWorkerResponse;
 class WebURL;
 
 class ServiceWorkerGlobalScopeClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerGlobalScopeClientImpl>, public ServiceWorkerGlobalScopeClient {
@@ -53,8 +52,7 @@ class ServiceWorkerGlobalScopeClientImpl FINAL : public NoBaseWillBeGarbageColle
 
     virtual void didHandleActivateEvent(int eventID, WebServiceWorkerEventResult) OVERRIDE;
     virtual void didHandleInstallEvent(int installEventID, WebServiceWorkerEventResult) OVERRIDE;
-    virtual void didHandleFetchEvent(int fetchEventID) OVERRIDE;
-    virtual void didHandleFetchEvent(int fetchEventID, const WebServiceWorkerResponse&) OVERRIDE;
+    virtual void didHandleFetchEvent(int fetchEventID, Response*) OVERRIDE;
     virtual void didHandleSyncEvent(int syncEventID) OVERRIDE;
     virtual void postMessageToClient(int clientID, const WebString& message, PassOwnPtr<WebMessagePortChannelArray>) OVERRIDE;