CacheStorage: Cache::putImpl should call onError in early-return cases

Source/modules/cachestorage/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/cachestorage/Cache.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 185 matching lines @@
         if (--m_numberOfRemainingOperations != 0)
             return;
         m_cache->webCache()->dispatchBatch(new CallbackPromiseAdapter<void, CacheStorageError>(m_resolver), m_batchOperations);
     }
 
     void onError(DOMException* exception)
     {
         if (m_completed)
             return;
         m_completed = true;
+        m_resolver->reject(exception);
+    }
 
-        ScriptState* state = m_resolver->scriptState();
-        ScriptState::Scope scope(state);
-        m_resolver->reject(V8ThrowException::createTypeError(state->isolate(), exception->toString()));
+    void onError(v8::Local<v8::Value> exception)
+    {
+        if (m_completed)
+            return;
+        m_completed = true;
+        m_resolver->reject(exception);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_cache);
         visitor->trace(m_resolver);
     }
 
 private:
     bool m_completed = false;
@@ skipping 202 matching lines @@
 }
 
 ScriptPromise Cache::putImpl(ScriptState* scriptState, const HeapVector<Member<Request>>& requests, const HeapVector<Member<Response>>& responses)
 {
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
     BarrierCallbackForPut* barrierCallback = new BarrierCallbackForPut(requests.size(), this, resolver.get());
 
     for (size_t i = 0; i < requests.size(); ++i) {
         KURL url(KURL(), requests[i]->url());
-        if (!url.protocolIsInHTTPFamily())
-            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Request scheme '" + url.protocol() + "' is unsupported"));
-        if (requests[i]->method() != "GET")
-            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Request method '" + requests[i]->method() + "' is unsupported"));
-        if (requests[i]->hasBody() && requests[i]->bodyUsed())
-            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Request body is already used"));
-        if (responses[i]->hasBody() && responses[i]->bodyUsed())
-            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Response body is already used"));
+        if (!url.protocolIsInHTTPFamily()) {
+            barrierCallback->onError(V8ThrowException::createTypeError(scriptState->isolate(), "Request scheme '" + url.protocol() + "' is unsupported"));
+            return promise;
+        }
+        if (requests[i]->method() != "GET") {
+            barrierCallback->onError(V8ThrowException::createTypeError(scriptState->isolate(), "Request method '" + requests[i]->method() + "' is unsupported"));
+            return promise;
+        }
+        if (requests[i]->hasBody() && requests[i]->bodyUsed()) {
+            barrierCallback->onError(V8ThrowException::createTypeError(scriptState->isolate(), "Request body is already used"));
+            return promise;
+        }
+        if (responses[i]->hasBody() && responses[i]->bodyUsed()) {
+            barrierCallback->onError(V8ThrowException::createTypeError(scriptState->isolate(), "Response body is already used"));
+            return promise;
+        }
 
         if (requests[i]->hasBody())
             requests[i]->lockBody(Body::PassBody);
         if (responses[i]->hasBody())
             responses[i]->lockBody(Body::PassBody);
 
         if (BodyStreamBuffer* buffer = responses[i]->internalBuffer()) {
             if (buffer == responses[i]->buffer() && responses[i]->isBodyConsumed())
                 buffer = responses[i]->createDrainingStream();
             // If the response body type is stream, read the all data and create
@@ skipping 30 matching lines @@
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 WebServiceWorkerCache* Cache::webCache() const
 {
     return m_webCache.get();
 }
 
 } // namespace blink