Title: [141061] trunk/Source/WebKit2
Revision
141061
Author
wei...@apple.com
Date
2013-01-28 23:14:20 -0800 (Mon, 28 Jan 2013)

Log Message

Remove support from ArgumentEncoder for deprecated encode functions
https://bugs.webkit.org/show_bug.cgi?id=108155

Reviewed by Dan Bernstein.

* Platform/CoreIPC/ArgumentEncoder.h:
(CoreIPC::ArgumentEncoder::encode):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (141060 => 141061)


--- trunk/Source/WebKit2/ChangeLog	2013-01-29 07:05:30 UTC (rev 141060)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-29 07:14:20 UTC (rev 141061)
@@ -1,5 +1,15 @@
 2013-01-28  Sam Weinig  <s...@webkit.org>
 
+        Remove support from ArgumentEncoder for deprecated encode functions
+        https://bugs.webkit.org/show_bug.cgi?id=108155
+
+        Reviewed by Dan Bernstein.
+
+        * Platform/CoreIPC/ArgumentEncoder.h:
+        (CoreIPC::ArgumentEncoder::encode):
+
+2013-01-28  Sam Weinig  <s...@webkit.org>
+
         Disable default use of the Plug-in XPCService until we can
         figure out how to deal with the 32-bit one.
 

Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h (141060 => 141061)


--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h	2013-01-29 07:05:30 UTC (rev 141060)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h	2013-01-29 07:14:20 UTC (rev 141061)
@@ -61,34 +61,8 @@
         encode(static_cast<uint64_t>(t));
     }
 
-    template<bool B, typename T = void>
-    struct EnableIf { };
-
-    template<typename T>
-    struct EnableIf<true, T> { typedef T Type; };
-    
-    template<typename T> class UsesDeprecatedEncodeFunction {
-        typedef char YesType;
-        struct NoType {
-            char padding[8];
-        };
-
-        static YesType checkEncode(void (*)(ArgumentEncoder*, const T&));
-        static NoType checkEncode(...);
-
-    public:
-        static const bool value = sizeof(checkEncode(ArgumentCoder<T>::encode)) == sizeof(YesType);
-    };
-
-    // FIXME: This is the function that gets chosen if the argument coder takes the ArgumentEncoder as a pointer.
-    // This is the deprecated form - get rid of it.
-    template<typename T> void encode(const T& t, typename EnableIf<UsesDeprecatedEncodeFunction<T>::value>::Type* = 0)
+    template<typename T> void encode(const T& t)
     {
-        ArgumentCoder<T>::encode(this, t);
-    }
-
-    template<typename T> void encode(const T& t, typename EnableIf<!UsesDeprecatedEncodeFunction<T>::value>::Type* = 0)
-    {
         ArgumentCoder<T>::encode(*this, t);
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to