Changeset 140857 in webkit

Timestamp:

Jan 25, 2013 12:18:58 PM (11 years ago)

Author:

eric@webkit.org

Message:

Support 4 and 5 argument bound static functions
​https://bugs.webkit.org/show_bug.cgi?id=107973

Reviewed by Anders Carlsson.

Yummy copy/paste template code!
I'm about to use this in a BackgroundHTMLParser patch, but figured this should be landed separately.

• wtf/Functional.h:

(WTF):
(WTF::R):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Functional.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-01-25  Eric Seidel  <eric@webkit.org>
+
+        Support 4 and 5 argument bound static functions
+        https://bugs.webkit.org/show_bug.cgi?id=107973
+
+        Reviewed by Anders Carlsson.
+
+        Yummy copy/paste template code!
+        I'm about to use this in a BackgroundHTMLParser patch, but figured this should be landed separately.
+
+        * wtf/Functional.h:
+        (WTF):
+        (WTF::R):
+
 2013-01-24  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WTF/wtf/Functional.h

@@ -79 +79 @@
 class FunctionWrapper;
 
+// Bound static functions:
+
 template<typename R>
 class FunctionWrapper<R (*)()> {
@@ -158 +160 @@
     R (*m_function)(P1, P2, P3);
 };
+
+template<typename R, typename P1, typename P2, typename P3, typename P4>
+class FunctionWrapper<R (*)(P1, P2, P3, P4)> {
+public:
+    typedef R ResultType;
+    static const bool shouldRefFirstParameter = false;
+
+    explicit FunctionWrapper(R (*function)(P1, P2, P3, P4))
+        : m_function(function)
+    {
+    }
+
+    R operator()(P1 p1, P2 p2, P3 p3, P4 p4)
+    {
+        return m_function(p1, p2, p3, p4);
+    }
+
+private:
+    R (*m_function)(P1, P2, P3, P4);
+};
+
+template<typename R, typename P1, typename P2, typename P3, typename P4, typename P5>
+class FunctionWrapper<R (*)(P1, P2, P3, P4, P5)> {
+public:
+    typedef R ResultType;
+    static const bool shouldRefFirstParameter = false;
+
+    explicit FunctionWrapper(R (*function)(P1, P2, P3, P4, P5))
+        : m_function(function)
+    {
+    }
+
+    R operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
+    {
+        return m_function(p1, p2, p3, p4, p5);
+    }
+
+private:
+    R (*m_function)(P1, P2, P3, P4, P5);
+};
+
+// Bound member functions:
 
 template<typename R, typename C>