Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation
authorhans@chromium.org <hans@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jan 2012 11:59:43 +0000 (11:59 +0000)
committerhans@chromium.org <hans@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jan 2012 11:59:43 +0000 (11:59 +0000)
commitc3d2bcbb9a713bb3fe06174be7b46d706f6ae407
tree6262ddcbeff5315839ddf15196130e5f0463393d
parent148477e5d717c315b77d4ba9b95d975c9bae1c82
Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation
https://bugs.webkit.org/show_bug.cgi?id=77083

Reviewed by Darin Fisher.

Source/WebCore:

Remove SpeechInputClientMock. The mock is moving to the DumpRenderTree
implementation.

No new tests, just refactoring.

* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* platform/mock/SpeechInputClientMock.cpp: Removed.
* platform/mock/SpeechInputClientMock.h: Removed.

Source/WebKit/chromium:

Remove the WebSpeechInputControllerMock interface and proxy
implementation. The mock is moving to the DumpRenderTree
implementation instead, which removes the need to expose this
interface in the WebKit API.

Also add a proper copy constructor for WebSpeechInputResult.
The default one doesn't do a proper copy.

* WebKit.gyp:
* public/WebSpeechInputControllerMock.h: Removed.
* public/WebSpeechInputResult.h:
(WebKit::WebSpeechInputResult::WebSpeechInputResult):
(WebSpeechInputResult):
* src/WebSpeechInputControllerMockImpl.cpp: Removed.
* src/WebSpeechInputControllerMockImpl.h: Removed.
* src/WebSpeechInputResult.cpp:
(WebKit::WebSpeechInputResult::set):
(WebKit):

Tools:

Add MockWebSpeechInputController which provides a mock implementation
of the WebSpeechInputController interface, and use that in
DumpRenderTree.

* DumpRenderTree/DumpRenderTree.gypi:
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::addMockSpeechInputResult):
* DumpRenderTree/chromium/LayoutTestController.h:
():
* DumpRenderTree/chromium/MockWebSpeechInputController.cpp: Added.
(MockWebSpeechInputController::create):
(MockWebSpeechInputController::addMockRecognitionResult):
(MockWebSpeechInputController::clearResults):
(MockWebSpeechInputController::startRecognition):
(MockWebSpeechInputController::cancelRecognition):
(MockWebSpeechInputController::stopRecording):
(MockWebSpeechInputController::MockWebSpeechInputController):
(MockWebSpeechInputController::speechTaskFired):
(MockWebSpeechInputController::SpeechTask::SpeechTask):
(MockWebSpeechInputController::SpeechTask::stop):
(MockWebSpeechInputController::SpeechTask::runIfValid):
* DumpRenderTree/chromium/MockWebSpeechInputController.h: Added.
(WebKit):
(MockWebSpeechInputController):
(MockWebSpeechInputController::taskList):
(SpeechTask):
* DumpRenderTree/chromium/TestShell.cpp:
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::speechInputController):
* DumpRenderTree/chromium/WebViewHost.h:
(WebKit):
(WebViewHost::speechInputControllerMock):
(WebViewHost):
():

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106353 268f45cc-cd09-0410-ab3c-d52691b4dbfc
24 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/mock/SpeechInputClientMock.cpp [deleted file]
Source/WebCore/platform/mock/SpeechInputClientMock.h [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/public/WebSpeechInputControllerMock.h [deleted file]
Source/WebKit/chromium/public/WebSpeechInputResult.h
Source/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h [deleted file]
Source/WebKit/chromium/src/WebSpeechInputResult.cpp
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.gypi
Tools/DumpRenderTree/chromium/LayoutTestController.cpp
Tools/DumpRenderTree/chromium/LayoutTestController.h
Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp [new file with mode: 0644]
Tools/DumpRenderTree/chromium/MockWebSpeechInputController.h [new file with mode: 0644]
Tools/DumpRenderTree/chromium/TestShell.cpp
Tools/DumpRenderTree/chromium/WebViewHost.cpp
Tools/DumpRenderTree/chromium/WebViewHost.h