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

Source/modules/cachestorage/CacheStorage.cpp

Index: Source/modules/cachestorage/CacheStorage.cpp
diff --git a/Source/modules/cachestorage/CacheStorage.cpp b/Source/modules/cachestorage/CacheStorage.cpp
index 3e670f01aa22a10dcea8a304815cb9beadd24a54..87d601f706594f64a98e7ff11866b695c9bffaf6 100644
--- a/Source/modules/cachestorage/CacheStorage.cpp
+++ b/Source/modules/cachestorage/CacheStorage.cpp
@@ -40,6 +40,18 @@ public:
         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)
@@ -48,6 +60,7 @@ public:
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
@@ -74,6 +87,18 @@ public:
         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)
@@ -82,6 +107,7 @@ public:
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     String m_cacheName;
@@ -102,6 +128,18 @@ public:
         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)
@@ -110,6 +148,7 @@ public:
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
@@ -131,6 +170,18 @@ public:
         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)
@@ -139,6 +190,7 @@ public:
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     String m_cacheName;
@@ -163,11 +215,21 @@ public:
         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;