CacheStorage: Pass an error object allocated on heap to WebCallbacks::onError (2)

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 18 matching lines @@
 public:
     CacheMatchCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
 
     virtual void onSuccess(WebServiceWorkerResponse* webResponse) override
     {
         m_resolver->resolve(Response::create(m_resolver->scriptState()->executionContext(), *webResponse));
         m_resolver.clear();
     }
 
+#ifdef CRBUG_494884

[kinuko, 2015/06/17 18:21:05]

Hmm, I have the same question... why we need this ifdef in the same patch where
we define it?

[nhiroki, 2015/06/17 23:34:41]

Right, these aren't necessary. Removed.

+    // Ownership of |rawReason| must be passed.
+    virtual void onError(WebServiceWorkerCacheError* rawReason) override
+    {
+        OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
+        if (*reason == WebServiceWorkerCacheErrorNotFound)
+            m_resolver->resolve();
+        else
+            m_resolver->reject(CacheStorageError::createException(*reason));
+        m_resolver.clear();
+    }
+#else
     virtual void onError(WebServiceWorkerCacheError* reason) override
     {
         if (*reason == WebServiceWorkerCacheErrorNotFound)
             m_resolver->resolve();
         else
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheWithResponsesCallbacks : public WebServiceWorkerCache::CacheWithResponsesCallbacks {
     WTF_MAKE_NONCOPYABLE(CacheWithResponsesCallbacks);
 public:
     CacheWithResponsesCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
 
     virtual void onSuccess(WebVector<WebServiceWorkerResponse>* webResponses) override
     {
         HeapVector<Member<Response>> responses;
         for (size_t i = 0; i < webResponses->size(); ++i)
             responses.append(Response::create(m_resolver->scriptState()->executionContext(), (*webResponses)[i]));
         m_resolver->resolve(responses);
         m_resolver.clear();
     }
 
+#ifdef CRBUG_494884
+    // Ownership of |rawReason| must be passed.
+    virtual void onError(WebServiceWorkerCacheError* rawReason) override
+    {
+        OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
+        m_resolver->reject(CacheStorageError::createException(*reason));
+        m_resolver.clear();
+    }
+#else
     virtual void onError(WebServiceWorkerCacheError* reason) override
     {
         m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 protected:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheDeleteCallback : public WebServiceWorkerCache::CacheBatchCallbacks {
     WTF_MAKE_NONCOPYABLE(CacheDeleteCallback);
 public:
     CacheDeleteCallback(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
 
     void onSuccess() override
     {
         m_resolver->resolve(true);
         m_resolver.clear();
     }
 
-    void onError(WebServiceWorkerCacheError* reason) override
+#ifdef CRBUG_494884
+    // Ownership of |rawReason| must be passed.
+    virtual void onError(WebServiceWorkerCacheError* rawReason) override
     {
+        OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
         if (*reason == WebServiceWorkerCacheErrorNotFound)
             m_resolver->resolve(false);
         else
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#else
+    virtual void onError(WebServiceWorkerCacheError* reason) override
+    {
+        m_resolver->reject(CacheStorageError::createException(*reason));

[jkarlin, 2015/06/17 11:16:15]

Why is this function different from above?

+        m_resolver.clear();
+    }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheWithRequestsCallbacks : public WebServiceWorkerCache::CacheWithRequestsCallbacks {
     WTF_MAKE_NONCOPYABLE(CacheWithRequestsCallbacks);
 public:
     CacheWithRequestsCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
 
     virtual void onSuccess(WebVector<WebServiceWorkerRequest>* webRequests) override
     {
         HeapVector<Member<Request>> requests;
         for (size_t i = 0; i < webRequests->size(); ++i)
             requests.append(Request::create(m_resolver->scriptState()->executionContext(), (*webRequests)[i]));
         m_resolver->resolve(requests);
         m_resolver.clear();
     }
 
+#ifdef CRBUG_494884
+    // Ownership of |rawReason| must be passed.
+    virtual void onError(WebServiceWorkerCacheError* rawReason) override
+    {
+        OwnPtr<WebServiceWorkerCacheError> reason = adoptPtr(rawReason);
+        m_resolver->reject(CacheStorageError::createException(*reason));
+        m_resolver.clear();
+    }
+#else
     virtual void onError(WebServiceWorkerCacheError* reason) override
     {
         m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 ScriptPromise rejectAsNotImplemented(ScriptState* scriptState)
 {
     return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "Cache is not implemented"));
 }
 
@@ skipping 292 matching lines @@
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 WebServiceWorkerCache* Cache::webCache() const
 {
     return m_webCache.get();
 }
 
 } // namespace blink