Revert 174956 "Oilpan: Move ThreadableWebSocketChannelClientWrap..."

trunk/Source/core/dom/CrossThreadTask.h

 /*
  * Copyright (C) 2009-2010 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 39 matching lines @@
 };
 
 template<typename T> struct CrossThreadTaskTraits<PassRefPtr<T> > {
     typedef PassRefPtr<T> ParamType;
 };
 
 template<typename T> struct CrossThreadTaskTraits<PassOwnPtr<T> > {
     typedef PassOwnPtr<T> ParamType;
 };
 
-// FIXME: Oilpan: Using a RawPtr is not safe.
-// We need to move ExecutionContextTask to the heap and make this a Member.
-template<typename T> struct CrossThreadTaskTraits<RawPtr<T> > {
-    typedef RawPtr<T> ParamType;
-};
-
 template<typename P1, typename MP1>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask1 : public ExecutionContextTask {
+class CrossThreadTask1 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1);
     typedef CrossThreadTask1<P1, MP1> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
 
     static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1)
     {
         return adoptPtr(new CrossThreadTask(method, parameter1));
     }
 
 private:
     CrossThreadTask1(Method method, Param1 parameter1)
         : m_method(method)
         , m_parameter1(parameter1)
     {
     }
 
     virtual void performTask(ExecutionContext* context)
     {
         (*m_method)(context, m_parameter1);
     }
 
 private:
     Method m_method;
     P1 m_parameter1;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask2 : public ExecutionContextTask {
+class CrossThreadTask2 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2);
     typedef CrossThreadTask2<P1, MP1, P2, MP2> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
 
     static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2)
     {
         return adoptPtr(new CrossThreadTask(method, parameter1, parameter2));
     }
@@ skipping 11 matching lines @@
         (*m_method)(context, m_parameter1, m_parameter2);
     }
 
 private:
     Method m_method;
     P1 m_parameter1;
     P2 m_parameter2;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask3 : public ExecutionContextTask {
+class CrossThreadTask3 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3);
     typedef CrossThreadTask3<P1, MP1, P2, MP2, P3, MP3> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
 
     static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
     {
         return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3));
@@ skipping 14 matching lines @@
     }
 
 private:
     Method m_method;
     P1 m_parameter1;
     P2 m_parameter2;
     P3 m_parameter3;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask4 : public ExecutionContextTask {
+class CrossThreadTask4 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3, MP4);
     typedef CrossThreadTask4<P1, MP1, P2, MP2, P3, MP3, P4, MP4> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
     typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
 
     static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4)
     {
@@ skipping 17 matching lines @@
 
 private:
     Method m_method;
     P1 m_parameter1;
     P2 m_parameter2;
     P3 m_parameter3;
     P4 m_parameter4;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask5 : public ExecutionContextTask {
+class CrossThreadTask5 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3, MP4, MP5);
     typedef CrossThreadTask5<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
     typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
     typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
 
     static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5)
@@ skipping 20 matching lines @@
 private:
     Method m_method;
     P1 m_parameter1;
     P2 m_parameter2;
     P3 m_parameter3;
     P4 m_parameter4;
     P5 m_parameter5;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask6 : public ExecutionContextTask {
+class CrossThreadTask6 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6);
     typedef CrossThreadTask6<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
     typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
     typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
     typedef typename CrossThreadTaskTraits<P6>::ParamType Param6;
 
@@ skipping 23 matching lines @@
     Method m_method;
     P1 m_parameter1;
     P2 m_parameter2;
     P3 m_parameter3;
     P4 m_parameter4;
     P5 m_parameter5;
     P6 m_parameter6;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask7 : public ExecutionContextTask {
+class CrossThreadTask7 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7);
     typedef CrossThreadTask7<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
     typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
     typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
     typedef typename CrossThreadTaskTraits<P6>::ParamType Param6;
     typedef typename CrossThreadTaskTraits<P7>::ParamType Param7;
@@ skipping 26 matching lines @@
     P1 m_parameter1;
     P2 m_parameter2;
     P3 m_parameter3;
     P4 m_parameter4;
     P5 m_parameter5;
     P6 m_parameter6;
     P7 m_parameter7;
 };
 
 template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
-class GC_PLUGIN_IGNORE("crbug.com/378192") CrossThreadTask8 : public ExecutionContextTask {
+class CrossThreadTask8 : public ExecutionContextTask {
 public:
     typedef void (*Method)(ExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8);
     typedef CrossThreadTask8<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7, P8, MP8> CrossThreadTask;
     typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
     typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
     typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
     typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
     typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
     typedef typename CrossThreadTaskTraits<P6>::ParamType Param6;
     typedef typename CrossThreadTaskTraits<P7>::ParamType Param7;
@@ skipping 130 matching lines @@
                                                        method,
                                                        CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
                                                        CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
                                                        CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
                                                        CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8));
 }
 
 } // namespace WebCore
 
 #endif // CrossThreadTask_h