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

Source/modules/cachestorage/Cache.cpp

Index: Source/modules/cachestorage/Cache.cpp
diff --git a/Source/modules/cachestorage/Cache.cpp b/Source/modules/cachestorage/Cache.cpp
index e26f38a07b7ae4176c592184ae64a0fa2b14b98e..1fffbec2e62d28b814f214da7588d8f694f02a8b 100644
--- a/Source/modules/cachestorage/Cache.cpp
+++ b/Source/modules/cachestorage/Cache.cpp
@@ -36,6 +36,18 @@ public:
         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)
@@ -44,6 +56,7 @@ public:
             m_resolver->reject(CacheStorageError::createException(*reason));
         m_resolver.clear();
     }
+#endif
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
@@ -65,11 +78,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
 
 protected:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
@@ -88,14 +111,24 @@ public:
         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;
@@ -117,11 +150,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;