Changeset 106219 in webkit
- Timestamp:
- Jan 30, 2012 1:31:58 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r106218 r106219 1 2012-01-26 Hans Wennborg <hans@chromium.org> 2 3 Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation 4 https://bugs.webkit.org/show_bug.cgi?id=77083 5 6 Reviewed by Darin Fisher. 7 8 Remove SpeechInputClientMock. The mock is moving to the DumpRenderTree 9 implementation. 10 11 No new tests, just refactoring. 12 13 * GNUmakefile.list.am: 14 * Target.pri: 15 * WebCore.gypi: 16 * WebCore.vcproj/WebCore.vcproj: 17 * WebCore.xcodeproj/project.pbxproj: 18 * platform/mock/SpeechInputClientMock.cpp: Removed. 19 * platform/mock/SpeechInputClientMock.h: Removed. 20 1 21 2012-01-30 Peter Rybin <peter.rybin@gmail.com> 2 22 -
trunk/Source/WebCore/GNUmakefile.list.am
r106217 r106219 3142 3142 Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \ 3143 3143 Source/WebCore/platform/mock/ScrollbarThemeMock.h \ 3144 Source/WebCore/platform/mock/SpeechInputClientMock.cpp \3145 Source/WebCore/platform/mock/SpeechInputClientMock.h \3146 3144 Source/WebCore/platform/network/AuthenticationChallengeBase.cpp \ 3147 3145 Source/WebCore/platform/network/AuthenticationChallengeBase.h \ -
trunk/Source/WebCore/Target.pri
r106192 r106219 1107 1107 platform/mock/GeolocationClientMock.cpp \ 1108 1108 platform/mock/GeolocationServiceMock.cpp \ 1109 platform/mock/SpeechInputClientMock.cpp \1110 1109 platform/mock/ScrollbarThemeMock.cpp \ 1111 1110 platform/network/AuthenticationChallengeBase.cpp \ … … 2101 2100 platform/mock/GeolocationClientMock.cpp \ 2102 2101 platform/mock/GeolocationServiceMock.h \ 2103 platform/mock/SpeechInputClientMock.h \2104 2102 platform/mock/ScrollbarThemeMock.h \ 2105 2103 platform/graphics/BitmapImage.h \ -
trunk/Source/WebCore/WebCore.gypi
r106217 r106219 3853 3853 'platform/mock/ScrollbarThemeMock.cpp', 3854 3854 'platform/mock/ScrollbarThemeMock.h', 3855 'platform/mock/SpeechInputClientMock.cpp',3856 'platform/mock/SpeechInputClientMock.h',3857 3855 'platform/network/AuthenticationChallengeBase.cpp', 3858 3856 'platform/network/BlobData.cpp', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r106217 r106219 32625 32625 > 32626 32626 </File> 32627 <File32628 RelativePath="..\platform\mock\SpeechInputClientMock.cpp"32629 >32630 </File>32631 <File32632 RelativePath="..\platform\mock\SpeechInputClientMock.h"32633 >32634 </File>32635 32627 </Filter> 32636 32628 </Filter> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r106217 r106219 1798 1798 750D029311D0E7F300BD1B27 /* RenderInputSpeech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */; }; 1799 1799 750D029411D0E7F300BD1B27 /* RenderInputSpeech.h in Headers */ = {isa = PBXBuildFile; fileRef = 750D029211D0E7F300BD1B27 /* RenderInputSpeech.h */; }; 1800 7535BC9412020CFF0037EC45 /* SpeechInputClientMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7535BC9212020CFF0037EC45 /* SpeechInputClientMock.cpp */; };1801 7535BC9512020CFF0037EC45 /* SpeechInputClientMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 7535BC9312020CFF0037EC45 /* SpeechInputClientMock.h */; };1802 1800 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; }; 1803 1801 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; }; … … 8660 8658 750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderInputSpeech.cpp; sourceTree = "<group>"; }; 8661 8659 750D029211D0E7F300BD1B27 /* RenderInputSpeech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderInputSpeech.h; sourceTree = "<group>"; }; 8662 7535BC9212020CFF0037EC45 /* SpeechInputClientMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SpeechInputClientMock.cpp; path = mock/SpeechInputClientMock.cpp; sourceTree = "<group>"; };8663 7535BC9312020CFF0037EC45 /* SpeechInputClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpeechInputClientMock.h; path = mock/SpeechInputClientMock.h; sourceTree = "<group>"; };8664 8660 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; }; 8665 8661 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; }; … … 14750 14746 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */, 14751 14747 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */, 14752 7535BC9212020CFF0037EC45 /* SpeechInputClientMock.cpp */,14753 7535BC9312020CFF0037EC45 /* SpeechInputClientMock.h */,14754 14748 ); 14755 14749 name = mock; … … 23517 23511 7578F90C11DDF26900D933C5 /* SpeechInput.h in Headers */, 23518 23512 7578F90D11DDF26900D933C5 /* SpeechInputClient.h in Headers */, 23519 7535BC9512020CFF0037EC45 /* SpeechInputClientMock.h in Headers */,23520 23513 75415AFD12958D5E003AD669 /* SpeechInputEvent.h in Headers */, 23521 23514 7578F92011E4E32800D933C5 /* SpeechInputListener.h in Headers */, … … 26574 26567 626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */, 26575 26568 7578F90B11DDF26900D933C5 /* SpeechInput.cpp in Sources */, 26576 7535BC9412020CFF0037EC45 /* SpeechInputClientMock.cpp in Sources */,26577 26569 75415C28129A9920003AD669 /* SpeechInputEvent.cpp in Sources */, 26578 26570 758978EC127090D60076D5A9 /* SpeechInputResult.cpp in Sources */, -
trunk/Source/WebKit/chromium/ChangeLog
r106216 r106219 1 2012-01-26 Hans Wennborg <hans@chromium.org> 2 3 Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation 4 https://bugs.webkit.org/show_bug.cgi?id=77083 5 6 Reviewed by Darin Fisher. 7 8 Remove the WebSpeechInputControllerMock interface and proxy 9 implementation. The mock is moving to the DumpRenderTree 10 implementation instead, which removes the need to expose this 11 interface in the WebKit API. 12 13 Also add a proper copy constructor for WebSpeechInputResult. 14 The default one doesn't do a proper copy. 15 16 * WebKit.gyp: 17 * public/WebSpeechInputControllerMock.h: Removed. 18 * public/WebSpeechInputResult.h: 19 (WebKit::WebSpeechInputResult::WebSpeechInputResult): 20 (WebSpeechInputResult): 21 * src/WebSpeechInputControllerMockImpl.cpp: Removed. 22 * src/WebSpeechInputControllerMockImpl.h: Removed. 23 * src/WebSpeechInputResult.cpp: 24 (WebKit::WebSpeechInputResult::set): 25 (WebKit): 26 1 27 2012-01-29 Kent Tamura <tkent@chromium.org> 2 28 -
trunk/Source/WebKit/chromium/WebKit.gyp
r106044 r106219 246 246 'public/WebSocketClient.h', 247 247 'public/WebSpeechInputController.h', 248 'public/WebSpeechInputControllerMock.h',249 248 'public/WebSpeechInputListener.h', 250 249 'public/WebSpeechInputResult.h', … … 643 642 'src/WebSolidColorLayer.cpp', 644 643 'src/WebSolidColorLayerImpl.cpp', 645 'src/WebSpeechInputControllerMockImpl.cpp',646 'src/WebSpeechInputControllerMockImpl.h',647 644 'src/WebSpeechInputResult.cpp', 648 645 'src/WebStorageAreaImpl.cpp', -
trunk/Source/WebKit/chromium/public/WebSpeechInputResult.h
r101122 r106219 43 43 public: 44 44 WebSpeechInputResult() { } 45 WebSpeechInputResult(const WebSpeechInputResult& other) { assign(other); } 45 46 ~WebSpeechInputResult() { reset(); } 46 47 47 48 WEBKIT_EXPORT void set(const WebString& utterance, double confidence); 49 WEBKIT_EXPORT void assign(const WebSpeechInputResult& other); 48 50 WEBKIT_EXPORT void reset(); 49 51 -
trunk/Source/WebKit/chromium/src/WebSpeechInputResult.cpp
r97379 r106219 49 49 } 50 50 51 void WebSpeechInputResult::assign(const WebSpeechInputResult& other) 52 { 53 m_private = WebCore::SpeechInputResult::create(*other.m_private.get()); 54 } 55 51 56 WebSpeechInputResult::operator PassRefPtr<WebCore::SpeechInputResult>() const 52 57 { -
trunk/Tools/ChangeLog
r106199 r106219 1 2012-01-26 Hans Wennborg <hans@chromium.org> 2 3 Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation 4 https://bugs.webkit.org/show_bug.cgi?id=77083 5 6 Reviewed by Darin Fisher. 7 8 Add MockWebSpeechInputController which provides a mock implementation 9 of the WebSpeechInputController interface, and use that in 10 DumpRenderTree. 11 12 * DumpRenderTree/DumpRenderTree.gypi: 13 * DumpRenderTree/chromium/LayoutTestController.cpp: 14 (LayoutTestController::addMockSpeechInputResult): 15 * DumpRenderTree/chromium/LayoutTestController.h: 16 (): 17 * DumpRenderTree/chromium/MockWebSpeechInputController.cpp: Added. 18 (MockWebSpeechInputController::create): 19 (MockWebSpeechInputController::addMockRecognitionResult): 20 (MockWebSpeechInputController::clearResults): 21 (MockWebSpeechInputController::startRecognition): 22 (MockWebSpeechInputController::cancelRecognition): 23 (MockWebSpeechInputController::stopRecording): 24 (MockWebSpeechInputController::MockWebSpeechInputController): 25 (MockWebSpeechInputController::speechTaskFired): 26 (MockWebSpeechInputController::SpeechTask::SpeechTask): 27 (MockWebSpeechInputController::SpeechTask::stop): 28 (MockWebSpeechInputController::SpeechTask::runIfValid): 29 * DumpRenderTree/chromium/MockWebSpeechInputController.h: Added. 30 (WebKit): 31 (MockWebSpeechInputController): 32 (MockWebSpeechInputController::taskList): 33 (SpeechTask): 34 * DumpRenderTree/chromium/TestShell.cpp: 35 * DumpRenderTree/chromium/WebViewHost.cpp: 36 (WebViewHost::speechInputController): 37 * DumpRenderTree/chromium/WebViewHost.h: 38 (WebKit): 39 (WebViewHost::speechInputControllerMock): 40 (WebViewHost): 41 (): 42 1 43 2012-01-29 Sheriff Bot <webkit.review.bot@gmail.com> 2 44 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gypi
r104764 r106219 23 23 'chromium/MockSpellCheck.cpp', 24 24 'chromium/MockSpellCheck.h', 25 'chromium/MockWebSpeechInputController.cpp', 26 'chromium/MockWebSpeechInputController.h', 25 27 'chromium/NotificationPresenter.h', 26 28 'chromium/NotificationPresenter.cpp', -
trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
r105789 r106219 34 34 35 35 #include "DRTDevToolsAgent.h" 36 #include "MockWebSpeechInputController.h" 36 37 #include "TestShell.h" 37 38 #include "WebAnimationController.h" … … 56 57 #include "WebSettings.h" 57 58 #include "platform/WebSize.h" 58 #include "WebSpeechInputControllerMock.h"59 59 #include "platform/WebURL.h" 60 60 #include "WebView.h" … … 1935 1935 return; 1936 1936 1937 if ( WebSpeechInputControllerMock* controller = m_shell->webViewHost()->speechInputControllerMock())1937 if (MockWebSpeechInputController* controller = m_shell->webViewHost()->speechInputControllerMock()) 1938 1938 controller->addMockRecognitionResult(cppVariantToWebString(arguments[0]), arguments[1].toDouble(), cppVariantToWebString(arguments[2])); 1939 1939 } -
trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h
r105789 r106219 53 53 namespace WebKit { 54 54 class WebGeolocationClientMock; 55 class WebSpeechInputController;56 class WebSpeechInputControllerMock;57 class WebSpeechInputListener;58 55 } 59 56 … … 443 440 void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); } 444 441 445 WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);446 442 bool shouldDumpAsAudio() const { return m_dumpAsAudio; } 447 443 void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; } … … 700 696 WebKit::WebURL m_userStyleSheetLocation; 701 697 702 OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;703 704 698 // WAV audio data is stored here. 705 699 WebKit::WebArrayBufferView m_audioData; -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r105500 r106219 53 53 #include "WebSettings.h" 54 54 #include "platform/WebSize.h" 55 #include "WebSpeechInputControllerMock.h"56 55 #include "platform/WebString.h" 57 56 #include "platform/WebURLRequest.h" -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp
r105789 r106219 33 33 34 34 #include "LayoutTestController.h" 35 #include "MockWebSpeechInputController.h" 35 36 #include "TestNavigationController.h" 36 37 #include "TestShell.h" … … 56 57 #include "WebScreenInfo.h" 57 58 #include "platform/WebSize.h" 58 #include "WebSpeechInputControllerMock.h"59 59 #include "WebStorageNamespace.h" 60 60 #include "WebTextCheckingCompletion.h" … … 679 679 { 680 680 if (!m_speechInputControllerMock) 681 m_speechInputControllerMock = adoptPtr(WebSpeechInputControllerMock::create(listener));681 m_speechInputControllerMock = MockWebSpeechInputController::create(listener); 682 682 return m_speechInputControllerMock.get(); 683 683 } -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.h
r105789 r106219 46 46 47 47 class LayoutTestController; 48 class MockWebSpeechInputController; 48 49 class SkCanvas; 49 50 class TestShell; … … 58 59 class WebSharedWorkerClient; 59 60 class WebSpeechInputController; 60 class WebSpeechInputControllerMock;61 61 class WebSpeechInputListener; 62 62 class WebURL; … … 109 109 void clearContextMenuData(); 110 110 111 WebKit::WebSpeechInputControllerMock* speechInputControllerMock() { return m_speechInputControllerMock.get(); }111 MockWebSpeechInputController* speechInputControllerMock() { return m_speechInputControllerMock.get(); } 112 112 113 113 #if ENABLE(POINTER_LOCK) … … 383 383 384 384 OwnPtr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationClientMock; 385 OwnPtr< WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;385 OwnPtr<MockWebSpeechInputController> m_speechInputControllerMock; 386 386 387 387 OwnPtr<WebKit::WebUserMediaClientMock> m_userMediaClientMock;
Note: See TracChangeset
for help on using the changeset viewer.