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

Source/modules/cachestorage/CacheStorage.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/CacheStorage.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 22 matching lines @@
     explicit Callbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
     virtual ~Callbacks() { }
 
     virtual void onSuccess() override
     {
         m_resolver->resolve(true);
         m_resolver.clear();
     }
 
+#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
     {
         if (*reason == WebServiceWorkerCacheErrorNotFound)
             m_resolver->resolve(false);
         else
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::WithCacheCallbacks final : public WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks {
     WTF_MAKE_NONCOPYABLE(WithCacheCallbacks);
 public:
     WithCacheCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resolver) { }
     virtual ~WithCacheCallbacks() { }
 
     virtual void onSuccess(WebServiceWorkerCache* webCache) override
     {
         // FIXME: Remove this once content's WebServiceWorkerCache implementation has landed.
         if (!webCache) {
             m_resolver->reject("not implemented");
             return;
         }
         Cache* cache = Cache::create(m_cacheStorage->m_scopedFetcher, webCache);
         m_cacheStorage->m_nameToCacheMap.set(m_cacheName, cache);
         m_resolver->resolve(cache);
         m_resolver.clear();
     }
 
+#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();
+        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:
     String m_cacheName;
     Persistent<CacheStorage> m_cacheStorage;
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::MatchCallbacks : public WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks {
     WTF_MAKE_NONCOPYABLE(MatchCallbacks);
 public:
     MatchCallbacks(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
+    // 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 CacheStorage::DeleteCallbacks final : public WebServiceWorkerCacheStorage::CacheStorageCallbacks {
     WTF_MAKE_NONCOPYABLE(DeleteCallbacks);
 public:
     DeleteCallbacks(const String& cacheName, CacheStorage* cacheStorage, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_cacheName(cacheName), m_cacheStorage(cacheStorage), m_resolver(resolver) { }
     virtual ~DeleteCallbacks() { }
 
     virtual void onSuccess() override
     {
         m_cacheStorage->m_nameToCacheMap.remove(m_cacheName);
         m_resolver->resolve(true);
         m_resolver.clear();
     }
 
+#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
     {
         if (*reason == WebServiceWorkerCacheErrorNotFound)
             m_resolver->resolve(false);
         else
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     String m_cacheName;
     Persistent<CacheStorage> m_cacheStorage;
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
 // FIXME: Consider using CallbackPromiseAdapter.
 class CacheStorage::KeysCallbacks final : public WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks {
     WTF_MAKE_NONCOPYABLE(KeysCallbacks);
 public:
     explicit KeysCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver) { }
     virtual ~KeysCallbacks() { }
 
     virtual void onSuccess(WebVector<WebString>* keys) override
     {
         Vector<String> wtfKeys;
         for (size_t i = 0; i < keys->size(); ++i)
             wtfKeys.append((*keys)[i]);
         m_resolver->resolve(wtfKeys);
         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;
 };
 
 CacheStorage* CacheStorage::create(WeakPtr<GlobalFetch::ScopedFetcher> fetcher, WebServiceWorkerCacheStorage* webCacheStorage)
 {
     return new CacheStorage(fetcher, adoptPtr(webCacheStorage));
 }
 
@@ skipping 93 matching lines @@
     visitor->trace(m_nameToCacheMap);
 }
 
 CacheStorage::CacheStorage(WeakPtr<GlobalFetch::ScopedFetcher> fetcher, PassOwnPtr<WebServiceWorkerCacheStorage> webCacheStorage)
     : m_scopedFetcher(fetcher)
     , m_webCacheStorage(webCacheStorage)
 {
 }
 
 } // namespace blink