Changeset 80340 in webkit

Timestamp:

Mar 4, 2011 2:06:30 AM (13 years ago)

Author:

morrita@google.com

Message:

2011-03-02 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

[Chromium][DRT] WebTask should use webkit_support::TaskAdaptor
​https://bugs.webkit.org/show_bug.cgi?id=55434

Changed WebTask to be a subclass of webkit_support::TaskAdaptor
and passed the object webkit_support::PostDelayedTask directly.

Note that the change keeps postTask() as is because it has a
semantics taht webkit_support::PostDelayedTask() has; It jumps to
the main thread.

• DumpRenderTree/chromium/Task.cpp: (postDelayedTask):
• DumpRenderTree/chromium/Task.h: (WebTask::Run):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/Task.cpp (modified) (2 diffs)
• DumpRenderTree/chromium/Task.h (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-02  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium][DRT] WebTask should use webkit_support::TaskAdaptor
+        https://bugs.webkit.org/show_bug.cgi?id=55434
+
+        Changed WebTask to be a subclass of webkit_support::TaskAdaptor
+        and passed the object webkit_support::PostDelayedTask directly.
+
+        Note that the change keeps postTask() as is because it has a
+        semantics taht webkit_support::PostDelayedTask() has; It jumps to
+        the main thread.
+
+        * DumpRenderTree/chromium/Task.cpp:
+        (postDelayedTask):
+        * DumpRenderTree/chromium/Task.h:
+        (WebTask::Run):
+
 2011-03-03  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
 

trunk/Tools/DumpRenderTree/chromium/Task.cpp

@@ -34 +34 @@
 #include "WebKit.h"
 #include "WebKitClient.h"
-#include "webkit/support/webkit_support.h"
 
 WebTask::WebTask(TaskList* list): m_taskList(list) { m_taskList->registerTask(this); }
@@ -70 +69 @@
 void postDelayedTask(WebTask* task, int64_t ms)
 {
-    webkit_support::PostDelayedTask(invokeTask, static_cast<void*>(task), ms);
+    webkit_support::PostDelayedTask(task, ms);
 }
 

trunk/Tools/DumpRenderTree/chromium/Task.h

@@ -32 +32 @@
 #define Task_h
 
+#include "webkit/support/webkit_support.h"
+#include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
@@ -38 +40 @@
 // WebTask represents a task which can run by postTask() or postDelayedTask().
 // it is named "WebTask", not "Task", to avoid conflist with base/task.h.
-class WebTask {
+class WebTask : public webkit_support::TaskAdaptor {
 public:
     WebTask(TaskList*);
@@ -46 +48 @@
     virtual void cancel() = 0;
     virtual ~WebTask();
+
+private:
+    virtual void Run() { run(); }
+
 protected:
     TaskList* m_taskList;