(WONT COMMIT) Make CallbackPromiseAdapter accept a bool object passed by value

Source/bindings/core/v8/CallbackPromiseAdapter.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 53 matching lines @@
 //
 // Now when calling into a WebKit API that requires a WebCallbacks<blink::WebMyClass, blink::WebMyClass>*:
 //
 //    // call signature: callSomeMethod(WebCallbacks<MyClass, MyClass>* callbacks)
 //    webObject->callSomeMethod(new CallbackPromiseAdapter<MyClass, MyClass>(resolver, scriptExecutionContext));
 //
 // Note:
 // - This class does not manage its own lifetime. In this example that ownership
 //   of the WebCallbacks instance is being passed in and it is up to the callee
 //   to free the WebCallbacks instance.
-// - onSuccess and onError take ownership of the given WebType instance.
+// - onSuccess(typename S::WebType*) and onError(typename T::WebType*) take
+//   ownership of the given WebType instance.
 template<typename S, typename T>
 class CallbackPromiseAdapter final : public WebCallbacks<typename S::WebType, typename T::WebType> {
     WTF_MAKE_NONCOPYABLE(CallbackPromiseAdapter);
 public:
     explicit CallbackPromiseAdapter(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver)
     {
         ASSERT(m_resolver);
     }
     virtual ~CallbackPromiseAdapter() { }
 
+    virtual void onSuccess(typename S::WebType result) override
+    {
+        ASSERT_NOT_REACHED();
+    }
+
     // Takes ownership of |result|.
     virtual void onSuccess(typename S::WebType* result) override
     {
         OwnPtr<typename S::WebType> ownPtr = adoptPtr(result);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         if (!result) {
             m_resolver->resolve(v8::Null(m_resolver->scriptState()->isolate()));
             return;
         }
@@ skipping 48 matching lines @@
 class CallbackPromiseAdapter<S, void> final : public WebCallbacks<typename S::WebType, void> {
     WTF_MAKE_NONCOPYABLE(CallbackPromiseAdapter);
 public:
     explicit CallbackPromiseAdapter(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver)
     {
         ASSERT(m_resolver);
     }
     virtual ~CallbackPromiseAdapter() { }
 
+    virtual void onSuccess(typename S::WebType result) override
+    {
+        ASSERT_NOT_REACHED();
+    }
+
     // Takes ownership of |result|.
     virtual void onSuccess(typename S::WebType* result) override
     {
         OwnPtr<typename S::WebType> ownPtr = adoptPtr(result);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->resolve(S::take(m_resolver.get(), ownPtr.release()));
     }
 
     virtual void onError() override
@@ skipping 11 matching lines @@
 class CallbackPromiseAdapter<bool, T> final : public WebCallbacks<bool, typename T::WebType> {
     WTF_MAKE_NONCOPYABLE(CallbackPromiseAdapter);
 public:
     explicit CallbackPromiseAdapter(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
         : m_resolver(resolver)
     {
         ASSERT(m_resolver);
     }
     virtual ~CallbackPromiseAdapter() { }
 
-    // TODO(nhiroki): onSuccess should take ownership of a bool object for
-    // consistency. (http://crbug.com/493531)
-    virtual void onSuccess(bool* result) override
+    virtual void onSuccess(bool result) override
     {
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
+        m_resolver->resolve(result);
+    }
+
+    virtual void onSuccess(bool* result) override
+    {
+        // TODO(nhiroki): Replace with ASSERT_NOT_REACHED() after chromium-side
+        // changes are landed (http://crbug.com/493531).
+        if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
+            return;
         m_resolver->resolve(*result);
     }
 
     // Takes ownership of |error|.
     virtual void onError(typename T::WebType* error) override
     {
         OwnPtr<typename T::WebType> ownPtr = adoptPtr(error);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject(T::take(m_resolver.get(), ownPtr.release()));
@@ skipping 25 matching lines @@
     {
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject();
     }
 
 private:
     RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
 };
 
-template<>
-class CallbackPromiseAdapter<bool, void> final : public WebCallbacks<bool, void> {
-    WTF_MAKE_NONCOPYABLE(CallbackPromiseAdapter);
-public:
-    explicit CallbackPromiseAdapter(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver)
-        : m_resolver(resolver)
-    {
-        ASSERT(m_resolver);
-    }
-    virtual ~CallbackPromiseAdapter() { }
-
-    // TODO(nhiroki): onSuccess should take ownership of a bool object for
-    // consistency. (http://crbug.com/493531)
-    virtual void onSuccess(bool* result) override
-    {
-        if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
-            return;
-        m_resolver->resolve(*result);
-    }
-
-    virtual void onError() override
-    {
-        if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
-            return;
-        m_resolver->reject();
-    }
-
-private:
-    RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
-};
-
 } // namespace blink
 
 #endif