summaryrefslogtreecommitdiff
path: root/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-23 10:25:11 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-23 10:25:11 +0200
commit5ea819f80c6840c492386bfafbffb059c7e2091f (patch)
tree42ad0b1d82eff090d14278a088ea0f4840a0f938 /Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h
parent43a42f108af6bcbd91f2672731c3047c26213af1 (diff)
downloadqtwebkit-5ea819f80c6840c492386bfafbffb059c7e2091f.tar.gz
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
Diffstat (limited to 'Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h')
-rw-r--r--Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h b/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h
index 6494a7f25..075f2541f 100644
--- a/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h
+++ b/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h
@@ -28,7 +28,7 @@
#if ENABLE(INPUT_SPEECH)
-#include "TestRunner/src/Task.h"
+#include "WebTask.h"
#include "platform/WebRect.h"
#include "WebSpeechInputController.h"
#include "WebSpeechInputResult.h"
@@ -58,13 +58,13 @@ public:
virtual void cancelRecognition(int requestId) OVERRIDE;
virtual void stopRecording(int requestId) OVERRIDE;
- TaskList* taskList() { return &m_taskList; }
+ WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
private:
MockWebSpeechInputController(WebKit::WebSpeechInputListener*);
void speechTaskFired();
- class SpeechTask : public MethodTask<MockWebSpeechInputController> {
+ class SpeechTask : public WebTestRunner::WebMethodTask<MockWebSpeechInputController> {
public:
SpeechTask(MockWebSpeechInputController*);
void stop();
@@ -75,7 +75,7 @@ private:
WebKit::WebSpeechInputListener* m_listener;
- TaskList m_taskList;
+ WebTestRunner::WebTaskList m_taskList;
SpeechTask* m_speechTask;
bool m_recording;