Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 25 insertions, 25 deletions

diff --git a/WebCore/html/FileThreadTask.h b/WebCore/html/FileThreadTask.h
index 09b647f..3443457 100644
--- a/WebCore/html/FileThreadTask.h
+++ b/WebCore/html/FileThreadTask.h
@@ -39,11 +39,11 @@
 
 namespace WebCore {
 
-template<typename R, typename T>
+template<typename T>
 class FileThreadTask0 : public FileThread::Task {
 public:
-    typedef R (T::*Method)();
-    typedef FileThreadTask0<R, T> FileThreadTaskImpl;
+    typedef void (T::*Method)();
+    typedef FileThreadTask0<T> FileThreadTaskImpl;
 
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method)
     {
@@ -66,11 +66,11 @@ private:
     Method m_method;
 };
 
-template<typename R, typename T, typename P1, typename MP1>
+template<typename T, typename P1, typename MP1>
 class FileThreadTask1 : public FileThread::Task {
 public:
-    typedef R (T::*Method)(MP1);
-    typedef FileThreadTask1<R, T, P1, MP1> FileThreadTaskImpl;
+    typedef void (T::*Method)(MP1);
+    typedef FileThreadTask1<T, P1, MP1> FileThreadTaskImpl;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
 
     static PassOwnPtr<FileThreadTaskImpl> create(T* instance, Method method, Param1 parameter1)
@@ -96,11 +96,11 @@ private:
     P1 m_parameter1;
 };
 
-template<typename R, typename T, typename P1, typename MP1, typename P2, typename MP2>
+template<typename T, typename P1, typename MP1, typename P2, typename MP2>
 class FileThreadTask2 : public FileThread::Task {
 public:
-    typedef R (T::*Method)(MP1, MP2);
-    typedef FileThreadTask2<R, T, P1, MP1, P2, MP2> FileThreadTaskImpl;
+    typedef void (T::*Method)(MP1, MP2);
+    typedef FileThreadTask2<T, P1, MP1, P2, MP2> FileThreadTaskImpl;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
 
@@ -129,11 +129,11 @@ private:
     P2 m_parameter2;
 };
 
-template<typename R, typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
+template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
 class FileThreadTask3 : public FileThread::Task {
 public:
     typedef void (T::*Method)(MP1, MP2, MP3);
-    typedef FileThreadTask3<R, T, P1, MP1, P2, MP2, P3, MP3> FileThreadTaskImpl;
+    typedef FileThreadTask3<T, P1, MP1, P2, MP2, P3, MP3> FileThreadTaskImpl;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
@@ -165,56 +165,56 @@ private:
     P3 m_parameter3;
 };
 
-template<typename R, typename T>
+template<typename T>
 PassOwnPtr<FileThread::Task> createFileThreadTask(
     T* const callee,
-    R (T::*method)());
+    void (T::*method)());
 
-template<typename R, typename T>
+template<typename T>
 PassOwnPtr<FileThread::Task> createFileThreadTask(
     T* const callee,
-    R (T::*method)())
+    void (T::*method)())
 {
-    return FileThreadTask0<R, T>::create(
+    return FileThreadTask0<T>::create(
         callee,
         method);
 }
 
-template<typename R, typename T, typename P1, typename MP1>
+template<typename T, typename P1, typename MP1>
 PassOwnPtr<FileThread::Task> createFileThreadTask(
     T* const callee,
-    R (T::*method)(MP1),
+    void (T::*method)(MP1),
     const P1& parameter1)
 {
-    return FileThreadTask1<R, T, typename CrossThreadCopier<P1>::Type, MP1>::create(
+    return FileThreadTask1<T, typename CrossThreadCopier<P1>::Type, MP1>::create(
         callee,
         method,
         CrossThreadCopier<P1>::copy(parameter1));
 }
 
-template<typename R, typename T, typename P1, typename MP1, typename P2, typename MP2>
+template<typename T, typename P1, typename MP1, typename P2, typename MP2>
 PassOwnPtr<FileThread::Task> createFileThreadTask(
     T* const callee,
-    R (T::*method)(MP1, MP2),
+    void (T::*method)(MP1, MP2),
     const P1& parameter1,
     const P2& parameter2)
 {
-    return FileThreadTask2<R, T, typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create(
+    return FileThreadTask2<T, typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create(
         callee,
         method,
         CrossThreadCopier<P1>::copy(parameter1),
         CrossThreadCopier<P2>::copy(parameter2));
 }
 
-template<typename R, typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
+template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
 PassOwnPtr<FileThread::Task> createFileThreadTask(
     T* const callee,
-    R (T::*method)(MP1, MP2, MP3),
+    void (T::*method)(MP1, MP2, MP3),
     const P1& parameter1,
     const P2& parameter2,
     const P3& parameter3)
 {
-    return FileThreadTask3<R, T, typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create(
+    return FileThreadTask3<T, typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create(
         callee,
         method,
         CrossThreadCopier<P1>::copy(parameter1),