Diff
Modified: trunk/Tools/ChangeLog (122808 => 122809)
--- trunk/Tools/ChangeLog 2012-07-17 06:19:01 UTC (rev 122808)
+++ trunk/Tools/ChangeLog 2012-07-17 06:27:31 UTC (rev 122809)
@@ -1,5 +1,18 @@
2012-07-16 Adam Barth <[email protected]>
+ [Chromium] Move Task.(cpp|h) into TestRunner.a
+ https://bugs.webkit.org/show_bug.cgi?id=91446
+
+ Reviewed by Ryosuke Niwa.
+
+ Task is a dependency of EventSender, which needs to move into TestRunner.a.
+
+ * DumpRenderTree/DumpRenderTree.gypi:
+ * DumpRenderTree/chromium/TestRunner/Task.cpp: Renamed from Tools/DumpRenderTree/chromium/Task.cpp.
+ * DumpRenderTree/chromium/TestRunner/Task.h: Renamed from Tools/DumpRenderTree/chromium/Task.h.
+
+2012-07-16 Adam Barth <[email protected]>
+
[Chromium] Move AccessibilityController and AccessibilityUIElement into TestRunner.a
https://bugs.webkit.org/show_bug.cgi?id=91443
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gypi (122808 => 122809)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-07-17 06:19:01 UTC (rev 122808)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-07-17 06:27:31 UTC (rev 122809)
@@ -22,8 +22,6 @@
'chromium/MockWebSpeechRecognizer.h',
'chromium/NotificationPresenter.h',
'chromium/NotificationPresenter.cpp',
- 'chromium/Task.h',
- 'chromium/Task.cpp',
'chromium/TestEventPrinter.h',
'chromium/TestEventPrinter.cpp',
'chromium/TestNavigationController.cpp',
@@ -64,6 +62,8 @@
'chromium/TestRunner/CppBoundClass.h',
'chromium/TestRunner/CppVariant.cpp',
'chromium/TestRunner/CppVariant.h',
+ 'chromium/TestRunner/Task.cpp',
+ 'chromium/TestRunner/Task.h',
'chromium/TestRunner/TestInterfaces.cpp',
'chromium/TestRunner/TestInterfaces.h',
'chromium/TestRunner/GamepadController.cpp',
Deleted: trunk/Tools/DumpRenderTree/chromium/Task.cpp (122808 => 122809)
--- trunk/Tools/DumpRenderTree/chromium/Task.cpp 2012-07-17 06:19:01 UTC (rev 122808)
+++ trunk/Tools/DumpRenderTree/chromium/Task.cpp 2012-07-17 06:27:31 UTC (rev 122809)
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Task.h"
-
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-
-WebTask::WebTask(TaskList* list)
- : m_taskList(list)
-{
- m_taskList->registerTask(this);
-}
-
-WebTask::~WebTask()
-{
- if (m_taskList)
- m_taskList->unregisterTask(this);
-}
-
-void TaskList::unregisterTask(WebTask* task)
-{
- size_t index = m_tasks.find(task);
- if (index != notFound)
- m_tasks.remove(index);
-}
-
-void TaskList::revokeAll()
-{
- while (!m_tasks.isEmpty())
- m_tasks[0]->cancel();
-}
-
-static void invokeTask(void* context)
-{
- WebTask* task = static_cast<WebTask*>(context);
- task->run();
- delete task;
-}
-
-void postTask(WebTask* task)
-{
- WebKit::webKitPlatformSupport()->callOnMainThread(invokeTask, static_cast<void*>(task));
-}
-
-void postDelayedTask(WebTask* task, int64_t ms)
-{
- webkit_support::PostDelayedTask(task, ms);
-}
-
-
Deleted: trunk/Tools/DumpRenderTree/chromium/Task.h (122808 => 122809)
--- trunk/Tools/DumpRenderTree/chromium/Task.h 2012-07-17 06:19:01 UTC (rev 122808)
+++ trunk/Tools/DumpRenderTree/chromium/Task.h 2012-07-17 06:27:31 UTC (rev 122809)
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef Task_h
-#define Task_h
-
-#include "webkit/support/webkit_support.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/Vector.h>
-
-class TaskList;
-
-// 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 : public webkit_support::TaskAdaptor {
-public:
- WebTask(TaskList*);
- // The main code of this task.
- // An implementation of run() should return immediately if cancel() was called.
- virtual void run() = 0;
- virtual void cancel() = 0;
- virtual ~WebTask();
-
-private:
- virtual void Run() { run(); }
-
-protected:
- TaskList* m_taskList;
-};
-
-class TaskList {
-public:
- TaskList() { }
- ~TaskList() { revokeAll(); }
- void registerTask(WebTask* task) { m_tasks.append(task); }
- void unregisterTask(WebTask*);
- void revokeAll();
-
-private:
- Vector<WebTask*> m_tasks;
-};
-
-// A task containing an object pointer of class T. Is is supposed that
-// runifValid() calls a member function of the object pointer.
-// Class T must have "TaskList* taskList()".
-template<class T> class MethodTask: public WebTask {
-public:
- MethodTask(T* object): WebTask(object->taskList()), m_object(object) { }
- virtual void run()
- {
- if (m_object)
- runIfValid();
- }
- virtual void cancel()
- {
- m_object = 0;
- m_taskList->unregisterTask(this);
- m_taskList = 0;
- }
- virtual void runIfValid() = 0;
-
-protected:
- T* m_object;
-};
-
-void postTask(WebTask*);
-void postDelayedTask(WebTask*, int64_t ms);
-
-#endif // Task_h
Copied: trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.cpp (from rev 122808, trunk/Tools/DumpRenderTree/chromium/Task.cpp) (0 => 122809)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.cpp (rev 0)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.cpp 2012-07-17 06:27:31 UTC (rev 122809)
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Task.h"
+
+#include "WebKit.h"
+#include "platform/WebKitPlatformSupport.h"
+
+WebTask::WebTask(TaskList* list)
+ : m_taskList(list)
+{
+ m_taskList->registerTask(this);
+}
+
+WebTask::~WebTask()
+{
+ if (m_taskList)
+ m_taskList->unregisterTask(this);
+}
+
+void TaskList::unregisterTask(WebTask* task)
+{
+ size_t index = m_tasks.find(task);
+ if (index != notFound)
+ m_tasks.remove(index);
+}
+
+void TaskList::revokeAll()
+{
+ while (!m_tasks.isEmpty())
+ m_tasks[0]->cancel();
+}
+
+static void invokeTask(void* context)
+{
+ WebTask* task = static_cast<WebTask*>(context);
+ task->run();
+ delete task;
+}
+
+void postTask(WebTask* task)
+{
+ WebKit::webKitPlatformSupport()->callOnMainThread(invokeTask, static_cast<void*>(task));
+}
+
+void postDelayedTask(WebTask* task, int64_t ms)
+{
+ webkit_support::PostDelayedTask(task, ms);
+}
+
+
Copied: trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.h (from rev 122808, trunk/Tools/DumpRenderTree/chromium/Task.h) (0 => 122809)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.h (rev 0)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/Task.h 2012-07-17 06:27:31 UTC (rev 122809)
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef Task_h
+#define Task_h
+
+#include "webkit/support/webkit_support.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/Vector.h>
+
+class TaskList;
+
+// 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 : public webkit_support::TaskAdaptor {
+public:
+ WebTask(TaskList*);
+ // The main code of this task.
+ // An implementation of run() should return immediately if cancel() was called.
+ virtual void run() = 0;
+ virtual void cancel() = 0;
+ virtual ~WebTask();
+
+private:
+ virtual void Run() { run(); }
+
+protected:
+ TaskList* m_taskList;
+};
+
+class TaskList {
+public:
+ TaskList() { }
+ ~TaskList() { revokeAll(); }
+ void registerTask(WebTask* task) { m_tasks.append(task); }
+ void unregisterTask(WebTask*);
+ void revokeAll();
+
+private:
+ Vector<WebTask*> m_tasks;
+};
+
+// A task containing an object pointer of class T. Is is supposed that
+// runifValid() calls a member function of the object pointer.
+// Class T must have "TaskList* taskList()".
+template<class T> class MethodTask: public WebTask {
+public:
+ MethodTask(T* object): WebTask(object->taskList()), m_object(object) { }
+ virtual void run()
+ {
+ if (m_object)
+ runIfValid();
+ }
+ virtual void cancel()
+ {
+ m_object = 0;
+ m_taskList->unregisterTask(this);
+ m_taskList = 0;
+ }
+ virtual void runIfValid() = 0;
+
+protected:
+ T* m_object;
+};
+
+void postTask(WebTask*);
+void postDelayedTask(WebTask*, int64_t ms);
+
+#endif // Task_h
