diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Tools/DumpRenderTree/chromium/LayoutTestController.h | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Tools/DumpRenderTree/chromium/LayoutTestController.h')
| -rw-r--r-- | Tools/DumpRenderTree/chromium/LayoutTestController.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.h b/Tools/DumpRenderTree/chromium/LayoutTestController.h index 603b3b92e..a686e8605 100644 --- a/Tools/DumpRenderTree/chromium/LayoutTestController.h +++ b/Tools/DumpRenderTree/chromium/LayoutTestController.h @@ -52,9 +52,6 @@ namespace WebKit { class WebGeolocationClientMock; -class WebSpeechInputController; -class WebSpeechInputControllerMock; -class WebSpeechInputListener; } namespace webkit_support { @@ -380,6 +377,7 @@ public: // Speech input related functions. void addMockSpeechInputResult(const CppArgumentList&, CppVariant*); + void setMockSpeechInputDumpRect(const CppArgumentList&, CppVariant*); void startSpeechInput(const CppArgumentList&, CppVariant*); void layerTreeAsText(const CppArgumentList& args, CppVariant* result); @@ -430,11 +428,18 @@ public: void enableFixedLayoutMode(const CppArgumentList&, CppVariant*); void setFixedLayoutSize(const CppArgumentList&, CppVariant*); +#if ENABLE(POINTER_LOCK) + void didLosePointerLock(const CppArgumentList&, CppVariant*); + void setPointerLockWillFailSynchronously(const CppArgumentList&, CppVariant*); + void setPointerLockWillFailAsynchronously(const CppArgumentList&, CppVariant*); +#endif + + void workerThreadCount(CppVariant*); + public: // The following methods are not exposed to JavaScript. void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); } - WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*); bool shouldDumpAsAudio() const { return m_dumpAsAudio; } void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; } bool shouldDumpAsText() { return m_dumpAsText; } @@ -691,8 +696,6 @@ private: WebKit::WebURL m_userStyleSheetLocation; - OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock; - // WAV audio data is stored here. WebKit::WebArrayBufferView m_audioData; |