Service Worker: Simplify rejection code in Cache implementation

Source/modules/serviceworkers/Cache.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/Cache.h"
 
 #include "bindings/core/v8/Dictionary.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "modules/serviceworkers/Request.h"
 #include "modules/serviceworkers/Response.h"
 #include "public/platform/WebServiceWorkerCache.h"
 
 namespace blink {
 
 namespace {
 
 const char* cacheErrorToString(WebServiceWorkerCacheError reason)
@@ skipping 85 matching lines @@
     virtual void onError(WebServiceWorkerCacheError* reason) OVERRIDE
     {
         m_resolver->reject(cacheErrorToString(*reason));
         m_resolver.clear();
     }
 
 private:
     RefPtr<ScriptPromiseResolver> m_resolver;
 };
 
-ScriptPromise rejectAsNotImplemented(ScriptState* scriptState)
+ScriptPromise rejectAsNotImplemented(ExceptionState& exceptionState)
 {
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
-    const ScriptPromise promise = resolver->promise();
-    resolver->reject(DOMException::create(NotSupportedError, "Cache is not implemented"));
-    return promise;
+    exceptionState.throwDOMException(NotSupportedError, "Cache is not implemented");
+    return ScriptPromise();
 }
 
 } // namespace
 
 PassRefPtrWillBeRawPtr<Cache> Cache::fromWebServiceWorkerCache(WebServiceWorkerCache* webCache)
 {
     if (Cache* cache = static_cast<Cache*>(webCache->proxyInterface()))
         return cache;
     return create(webCache);
 }
 
 Cache::~Cache()
 {
 }
 
-ScriptPromise Cache::match(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict)
+ScriptPromise Cache::match(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
     if (exceptionState.hadException())
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    //        return ScriptPromise::reject(DOMException::create(NotFoundError, "The specified Service Worker resource was not found."));
+        return ScriptPromise();
     return matchImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::match(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict)
+ScriptPromise Cache::match(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
     if (exceptionState.hadException())
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    //        return ScriptPromise::reject(DOMException::create(NotFoundError, "The specified Service Worker resource was not found."));
+        return ScriptPromise();
     return matchImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::matchAll(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict)
+ScriptPromise Cache::matchAll(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return matchAllImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::matchAll(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict)
+ScriptPromise Cache::matchAll(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return matchAllImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::add(ScriptState* scriptState, Request* originalRequest)
+ScriptPromise Cache::add(ScriptState* scriptState, Request* originalRequest, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
-    return addImpl(scriptState, request);
+    if (exceptionState.hadException())
+        return ScriptPromise();
+    return addImpl(scriptState, request, exceptionState);
 }
 
-ScriptPromise Cache::add(ScriptState* scriptState, const String& requestString)
+ScriptPromise Cache::add(ScriptState* scriptState, const String& requestString, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
-    return addImpl(scriptState, request);
+    if (exceptionState.hadException())
+        return ScriptPromise();
+    return addImpl(scriptState, request, exceptionState);
 }
 
-ScriptPromise Cache::addAll(ScriptState* scriptState, const Vector<ScriptValue>& rawRequests)
+ScriptPromise Cache::addAll(ScriptState* scriptState, const Vector<ScriptValue>& rawRequests, ExceptionState& exceptionState)
 {
-    return rejectAsNotImplemented(scriptState);
+    return rejectAsNotImplemented(exceptionState);
 }
 
-ScriptPromise Cache::deleteFunction(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict)
+ScriptPromise Cache::deleteFunction(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return deleteImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::deleteFunction(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict)
+ScriptPromise Cache::deleteFunction(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return deleteImpl(scriptState, request, queryParamsDict);
 }
 
-ScriptPromise Cache::put(ScriptState* scriptState, Request* originalRequest, Response* response)
+ScriptPromise Cache::put(ScriptState* scriptState, Request* originalRequest, Response* response, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return putImpl(scriptState, request, response);
 }
 
-ScriptPromise Cache::put(ScriptState* scriptState, const String& requestString, Response* response)
+ScriptPromise Cache::put(ScriptState* scriptState, const String& requestString, Response* response, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return putImpl(scriptState, request, response);
 }
 
-ScriptPromise Cache::keys(ScriptState* scriptState)
+ScriptPromise Cache::keys(ScriptState* scriptState, ExceptionState& exceptionState)
 {
     return keysImpl(scriptState, RefPtrWillBeRawPtr<Request>(), Dictionary());
 }
 
-ScriptPromise Cache::keys(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict)
+ScriptPromise Cache::keys(ScriptState* scriptState, Request* originalRequest, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), originalRequest, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return keysImpl(scriptState);
 }
 
-ScriptPromise Cache::keys(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict)
+ScriptPromise Cache::keys(ScriptState* scriptState, const String& requestString, const Dictionary& queryParamsDict, ExceptionState& exceptionState)
 {
-    TrackExceptionState exceptionState;
     RefPtrWillBeRawPtr<Request> request = Request::create(scriptState->executionContext(), requestString, exceptionState);
-    if (exceptionState.hadException()) {
-        // FIXME: We should throw the caught error.
-        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(exceptionState.message(), scriptState->isolate()));
-    }
+    if (exceptionState.hadException())
+        return ScriptPromise();
     return keysImpl(scriptState, request, queryParamsDict);
 }
 
 Cache::Cache(WebServiceWorkerCache* webCache) : m_webCache(adoptPtr(webCache))
 {
     ScriptWrappable::init(this);
     ASSERT(m_webCache->proxyInterface() == 0);
     m_webCache->setProxyInterface(this);
 }
 
@@ skipping 17 matching lines @@
 {
     WebServiceWorkerRequest webRequest;
     request->populateWebServiceWorkerRequest(webRequest);
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
     m_webCache->dispatchMatchAll(new CacheWithResponsesCallbacks(resolver), webRequest, queryParamsFromDictionary(queryParamsDict));
     return promise;
 }
 
-ScriptPromise Cache::addImpl(ScriptState* scriptState, PassRefPtrWillBeRawPtr<Request>)
+ScriptPromise Cache::addImpl(ScriptState* scriptState, PassRefPtrWillBeRawPtr<Request>, ExceptionState& exceptionState)
 {
-    return rejectAsNotImplemented(scriptState);
+    return rejectAsNotImplemented(exceptionState);
 }
 
-ScriptPromise Cache::addAllImpl(ScriptState* scriptState, Vector<RefPtrWillBeRawPtr<Request> >)
+ScriptPromise Cache::addAllImpl(ScriptState* scriptState, Vector<RefPtrWillBeRawPtr<Request> >, ExceptionState& exceptionState)
 {
-    return rejectAsNotImplemented(scriptState);
+    return rejectAsNotImplemented(exceptionState);
 }
 
 PassRefPtrWillBeRawPtr<DOMException> Cache::domExceptionForCacheError(WebServiceWorkerCacheError reason)
 {
     switch (reason) {
     case WebServiceWorkerCacheErrorNotImplemented:
         return DOMException::create(NotSupportedError, "Method is not implemented.");
     case WebServiceWorkerCacheErrorNotFound:
         return DOMException::create(NotFoundError, "Entry was not found.");
     case WebServiceWorkerCacheErrorExists:
@@ skipping 43 matching lines @@
     WebServiceWorkerRequest webRequest;
     request->populateWebServiceWorkerRequest(webRequest);
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, WebServiceWorkerCache::QueryParams());
     return promise;
 }
 
 } // namespace blink