Changeset 102813 in webkit

Timestamp:

Dec 14, 2011 12:59:53 PM (12 years ago)

Author:

andersca@apple.com

Message:

bind should handle member functions
​https://bugs.webkit.org/show_bug.cgi?id=74529

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Add FunctionWrapper partial specializations for member function pointers.

• wtf/Functional.h:

(WTF::C::):

Tools:

Add tests.

• TestWebKitAPI/Tests/WTF/Functional.cpp:

(TestWebKitAPI::A::A):
(TestWebKitAPI::A::f):
(TestWebKitAPI::A::addF):
(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Functional.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/Functional.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-14  Anders Carlsson  <andersca@apple.com>
+
+        bind should handle member functions
+        https://bugs.webkit.org/show_bug.cgi?id=74529
+
+        Reviewed by Sam Weinig.
+
+        Add FunctionWrapper partial specializations for member function pointers.
+
+        * wtf/Functional.h:
+        (WTF::C::):
+
 2011-12-14  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Functional.h

@@ -97 +97 @@
 };
 
+template<typename R, typename C> class FunctionWrapper<R (C::*)()> {
+public:
+    typedef R ResultType;
+
+    explicit FunctionWrapper(R (C::*function)())
+        : m_function(function)
+    {
+    }
+
+    R operator()(C* c)
+    {
+        return (c->*m_function)();
+    }
+
+private:
+    R (C::*m_function)();
+};
+
+template<typename R, typename C, typename P0> class FunctionWrapper<R (C::*)(P0)> {
+public:
+    typedef R ResultType;
+
+    explicit FunctionWrapper(R (C::*function)(P0))
+        : m_function(function)
+    {
+    }
+
+    R operator()(C* c, P0 p0)
+    {
+        return (c->*m_function)(p0);
+    }
+
+private:
+    R (C::*m_function)(P0);
+};
+
 class FunctionImplBase : public ThreadSafeRefCounted<FunctionImplBase> {
 public:

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-14  Anders Carlsson  <andersca@apple.com>
+
+        bind should handle member functions
+        https://bugs.webkit.org/show_bug.cgi?id=74529
+
+        Reviewed by Sam Weinig.
+
+        Add tests.
+
+        * TestWebKitAPI/Tests/WTF/Functional.cpp:
+        (TestWebKitAPI::A::A):
+        (TestWebKitAPI::A::f):
+        (TestWebKitAPI::A::addF):
+        (TestWebKitAPI::TEST):
+
 2011-12-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp

@@ -82 +82 @@
 }
 
+class A {
+public:
+    explicit A(int i)
+        : m_i(i)
+    {
+    }
+
+    int f() { return m_i; }
+    int addF(int j) { return m_i + j; }
+
+private:
+    int m_i;
+};
+
+TEST(FunctionalTest, MemberFunctionBind)
+{
+    A a(10);
+    Function<int ()> function1 = bind(&A::f, &a);
+    ASSERT_EQ(10, function1());
+
+    Function<int ()> function2 = bind(&A::addF, &a, 15);
+    ASSERT_EQ(25, function2());
+}
+
 } // namespace TestWebKitAPI