Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal

1 files changed, 5 insertions, 5 deletions

diff --git a/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.h b/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.h
index 4cc045669..419c5e504 100644
--- a/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.h
+++ b/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.h
@@ -28,8 +28,8 @@
 
 #if ENABLE(SCRIPTED_SPEECH)
 
-#include "TestRunner/src/Task.h"
 #include "WebSpeechRecognizer.h"
+#include "WebTask.h"
 #include <wtf/Compiler.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
@@ -58,7 +58,7 @@ public:
     // Methods accessed from Task objects:
     WebKit::WebSpeechRecognizerClient* client() { return m_client; }
     WebKit::WebSpeechRecognitionHandle& handle() { return m_handle; }
-    TaskList* taskList() { return &m_taskList; }
+    WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
 
     class Task {
     public:
@@ -74,7 +74,7 @@ private:
     void startTaskQueue();
     void clearTaskQueue();
 
-    TaskList m_taskList;
+    WebTestRunner::WebTaskList m_taskList;
     WebKit::WebSpeechRecognitionHandle m_handle;
     WebKit::WebSpeechRecognizerClient* m_client;
     Vector<WebKit::WebString> m_mockTranscripts;
@@ -86,9 +86,9 @@ private:
     bool m_taskQueueRunning;
 
     // Task for stepping the queue.
-    class StepTask : public MethodTask<MockWebSpeechRecognizer> {
+    class StepTask : public WebTestRunner::WebMethodTask<MockWebSpeechRecognizer> {
     public:
-        StepTask(MockWebSpeechRecognizer* object) : MethodTask<MockWebSpeechRecognizer>(object) { }
+        StepTask(MockWebSpeechRecognizer* object) : WebTestRunner::WebMethodTask<MockWebSpeechRecognizer>(object) { }
         virtual void runIfValid() OVERRIDE;
     };
 };