Changeset 106223 in webkit


Ignore:
Timestamp:
Jan 30, 2012 2:10:33 AM (12 years ago)
Author:
hans@chromium.org
Message:

Unreviewed, rolling out r106219.
​http://trac.webkit.org/changeset/106219
​https://bugs.webkit.org/show_bug.cgi?id=77083

This broke Chromium's test_shell.

Source/WebCore:

  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/mock/SpeechInputClientMock.cpp: Added.

(WebCore):
(WebCore::SpeechInputClientMock::SpeechInputClientMock):
(WebCore::SpeechInputClientMock::setListener):
(WebCore::SpeechInputClientMock::startRecognition):
(WebCore::SpeechInputClientMock::stopRecording):
(WebCore::SpeechInputClientMock::cancelRecognition):
(WebCore::SpeechInputClientMock::addRecognitionResult):
(WebCore::SpeechInputClientMock::clearResults):
(WebCore::SpeechInputClientMock::timerFired):

  • platform/mock/SpeechInputClientMock.h: Added.

(WebCore):
(SpeechInputClientMock):

Source/WebKit/chromium:

  • WebKit.gyp:
  • public/WebSpeechInputControllerMock.h: Added.

(WebKit):
(WebSpeechInputControllerMock):
(WebKit::WebSpeechInputControllerMock::~WebSpeechInputControllerMock):

  • public/WebSpeechInputResult.h:

(WebSpeechInputResult):

  • src/WebSpeechInputControllerMockImpl.cpp: Added.

(WebKit):
(WebKit::WebSpeechInputControllerMock::create):
(WebKit::WebSpeechInputControllerMockImpl::WebSpeechInputControllerMockImpl):
(WebKit::WebSpeechInputControllerMockImpl::~WebSpeechInputControllerMockImpl):
(WebKit::WebSpeechInputControllerMockImpl::addMockRecognitionResult):
(WebKit::WebSpeechInputControllerMockImpl::clearResults):
(WebKit::WebSpeechInputControllerMockImpl::didCompleteRecording):
(WebKit::WebSpeechInputControllerMockImpl::didCompleteRecognition):
(WebKit::WebSpeechInputControllerMockImpl::setRecognitionResult):
(WebKit::WebSpeechInputControllerMockImpl::startRecognition):
(WebKit::WebSpeechInputControllerMockImpl::cancelRecognition):
(WebKit::WebSpeechInputControllerMockImpl::stopRecording):

  • src/WebSpeechInputControllerMockImpl.h: Added.

(WebCore):
(WebKit):
(WebSpeechInputControllerMockImpl):

  • src/WebSpeechInputResult.cpp:

Tools:

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::addMockSpeechInputResult):

  • DumpRenderTree/chromium/LayoutTestController.h:

(WebKit):
(LayoutTestController):
():

  • DumpRenderTree/chromium/MockWebSpeechInputController.cpp: Removed.
  • DumpRenderTree/chromium/MockWebSpeechInputController.h: Removed.
  • DumpRenderTree/chromium/TestShell.cpp:
  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::speechInputController):

  • DumpRenderTree/chromium/WebViewHost.h:

(WebKit):
(WebViewHost::speechInputControllerMock):
(WebViewHost):
():

Location:
trunk
Files:
5 added
2 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r106221 r106223  
     12012-01-30  Hans Wennborg  <hans@chromium.org>
     2
     3        Unreviewed, rolling out r106219.
     4        http://trac.webkit.org/changeset/106219
     5        https://bugs.webkit.org/show_bug.cgi?id=77083
     6
     7        This broke Chromium's test_shell.
     8
     9        * GNUmakefile.list.am:
     10        * Target.pri:
     11        * WebCore.gypi:
     12        * WebCore.vcproj/WebCore.vcproj:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * platform/mock/SpeechInputClientMock.cpp: Added.
     15        (WebCore):
     16        (WebCore::SpeechInputClientMock::SpeechInputClientMock):
     17        (WebCore::SpeechInputClientMock::setListener):
     18        (WebCore::SpeechInputClientMock::startRecognition):
     19        (WebCore::SpeechInputClientMock::stopRecording):
     20        (WebCore::SpeechInputClientMock::cancelRecognition):
     21        (WebCore::SpeechInputClientMock::addRecognitionResult):
     22        (WebCore::SpeechInputClientMock::clearResults):
     23        (WebCore::SpeechInputClientMock::timerFired):
     24        * platform/mock/SpeechInputClientMock.h: Added.
     25        (WebCore):
     26        (SpeechInputClientMock):
     27
    1282012-01-30  Yury Semikhatsky  <yurys@chromium.org>
    229

  • trunk/Source/WebCore/GNUmakefile.list.am

    r106220 r106223  
    31423142        Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \
    31433143        Source/WebCore/platform/mock/ScrollbarThemeMock.h \
     3144        Source/WebCore/platform/mock/SpeechInputClientMock.cpp \
     3145        Source/WebCore/platform/mock/SpeechInputClientMock.h \
    31443146        Source/WebCore/platform/network/AuthenticationChallengeBase.cpp \
    31453147        Source/WebCore/platform/network/AuthenticationChallengeBase.h \

  • trunk/Source/WebCore/Target.pri

    r106219 r106223  
    11071107    platform/mock/GeolocationClientMock.cpp \
    11081108    platform/mock/GeolocationServiceMock.cpp \
     1109    platform/mock/SpeechInputClientMock.cpp \
    11091110    platform/mock/ScrollbarThemeMock.cpp \
    11101111    platform/network/AuthenticationChallengeBase.cpp \
    … …  
    21002101    platform/mock/GeolocationClientMock.cpp \
    21012102    platform/mock/GeolocationServiceMock.h \
     2103    platform/mock/SpeechInputClientMock.h \
    21022104    platform/mock/ScrollbarThemeMock.h \
    21032105    platform/graphics/BitmapImage.h \

  • trunk/Source/WebCore/WebCore.gypi

    r106219 r106223  
    38533853            'platform/mock/ScrollbarThemeMock.cpp',
    38543854            'platform/mock/ScrollbarThemeMock.h',
     3855            'platform/mock/SpeechInputClientMock.cpp',
     3856            'platform/mock/SpeechInputClientMock.h',
    38553857            'platform/network/AuthenticationChallengeBase.cpp',
    38563858            'platform/network/BlobData.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r106219 r106223  
    3262532625                                        >
    3262632626                                </File>
     32627                                <File
     32628                                        RelativePath="..\platform\mock\SpeechInputClientMock.cpp"
     32629                                        >
     32630                                </File>
     32631                                <File
     32632                                        RelativePath="..\platform\mock\SpeechInputClientMock.h"
     32633                                        >
     32634                                </File>
    3262732635                        </Filter>
    3262832636                </Filter>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r106219 r106223  
    17981798                750D029311D0E7F300BD1B27 /* RenderInputSpeech.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */; };
    17991799                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 */; };
    18001802                754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; };
    18011803                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; };
    … …  
    86588660                750D029111D0E7F300BD1B27 /* RenderInputSpeech.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderInputSpeech.cpp; sourceTree = "<group>"; };
    86598661                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>"; };
    86608664                754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; };
    86618665                754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; };
    … …  
    1474614750                                0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */,
    1474714751                                0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */,
     14752                                7535BC9212020CFF0037EC45 /* SpeechInputClientMock.cpp */,
     14753                                7535BC9312020CFF0037EC45 /* SpeechInputClientMock.h */,
    1474814754                        );
    1474914755                        name = mock;
    … …  
    2351123517                                7578F90C11DDF26900D933C5 /* SpeechInput.h in Headers */,
    2351223518                                7578F90D11DDF26900D933C5 /* SpeechInputClient.h in Headers */,
     23519                                7535BC9512020CFF0037EC45 /* SpeechInputClientMock.h in Headers */,
    2351323520                                75415AFD12958D5E003AD669 /* SpeechInputEvent.h in Headers */,
    2351423521                                7578F92011E4E32800D933C5 /* SpeechInputListener.h in Headers */,
    … …  
    2656726574                                626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */,
    2656826575                                7578F90B11DDF26900D933C5 /* SpeechInput.cpp in Sources */,
     26576                                7535BC9412020CFF0037EC45 /* SpeechInputClientMock.cpp in Sources */,
    2656926577                                75415C28129A9920003AD669 /* SpeechInputEvent.cpp in Sources */,
    2657026578                                758978EC127090D60076D5A9 /* SpeechInputResult.cpp in Sources */,

  • trunk/Source/WebKit/chromium/ChangeLog

    r106219 r106223  
     12012-01-30  Hans Wennborg  <hans@chromium.org>
     2
     3        Unreviewed, rolling out r106219.
     4        http://trac.webkit.org/changeset/106219
     5        https://bugs.webkit.org/show_bug.cgi?id=77083
     6
     7        This broke Chromium's test_shell.
     8
     9        * WebKit.gyp:
     10        * public/WebSpeechInputControllerMock.h: Added.
     11        (WebKit):
     12        (WebSpeechInputControllerMock):
     13        (WebKit::WebSpeechInputControllerMock::~WebSpeechInputControllerMock):
     14        * public/WebSpeechInputResult.h:
     15        (WebSpeechInputResult):
     16        * src/WebSpeechInputControllerMockImpl.cpp: Added.
     17        (WebKit):
     18        (WebKit::WebSpeechInputControllerMock::create):
     19        (WebKit::WebSpeechInputControllerMockImpl::WebSpeechInputControllerMockImpl):
     20        (WebKit::WebSpeechInputControllerMockImpl::~WebSpeechInputControllerMockImpl):
     21        (WebKit::WebSpeechInputControllerMockImpl::addMockRecognitionResult):
     22        (WebKit::WebSpeechInputControllerMockImpl::clearResults):
     23        (WebKit::WebSpeechInputControllerMockImpl::didCompleteRecording):
     24        (WebKit::WebSpeechInputControllerMockImpl::didCompleteRecognition):
     25        (WebKit::WebSpeechInputControllerMockImpl::setRecognitionResult):
     26        (WebKit::WebSpeechInputControllerMockImpl::startRecognition):
     27        (WebKit::WebSpeechInputControllerMockImpl::cancelRecognition):
     28        (WebKit::WebSpeechInputControllerMockImpl::stopRecording):
     29        * src/WebSpeechInputControllerMockImpl.h: Added.
     30        (WebCore):
     31        (WebKit):
     32        (WebSpeechInputControllerMockImpl):
     33        * src/WebSpeechInputResult.cpp:
     34
    1352012-01-26  Hans Wennborg  <hans@chromium.org>
    236

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r106219 r106223  
    246246                'public/WebSocketClient.h',
    247247                'public/WebSpeechInputController.h',
     248                'public/WebSpeechInputControllerMock.h',
    248249                'public/WebSpeechInputListener.h',
    249250                'public/WebSpeechInputResult.h',
    … …  
    642643                'src/WebSolidColorLayer.cpp',
    643644                'src/WebSolidColorLayerImpl.cpp',
     645                'src/WebSpeechInputControllerMockImpl.cpp',
     646                'src/WebSpeechInputControllerMockImpl.h',
    644647                'src/WebSpeechInputResult.cpp',
    645648                'src/WebStorageAreaImpl.cpp',

  • trunk/Source/WebKit/chromium/public/WebSpeechInputResult.h

    r106219 r106223  
    4343public:
    4444    WebSpeechInputResult() { }
    45     WebSpeechInputResult(const WebSpeechInputResult& other) { assign(other); }
    4645    ~WebSpeechInputResult() { reset(); }
    4746
    4847    WEBKIT_EXPORT void set(const WebString& utterance, double confidence);
    49     WEBKIT_EXPORT void assign(const WebSpeechInputResult& other);
    5048    WEBKIT_EXPORT void reset();
    5149

  • trunk/Source/WebKit/chromium/src/WebSpeechInputResult.cpp

    r106219 r106223  
    4949}
    5050
    51 void WebSpeechInputResult::assign(const WebSpeechInputResult& other)
    52 {
    53     m_private = WebCore::SpeechInputResult::create(*other.m_private.get());
    54 }
    55 
    5651WebSpeechInputResult::operator PassRefPtr<WebCore::SpeechInputResult>() const
    5752{

  • trunk/Tools/ChangeLog

    r106219 r106223  
     12012-01-30  Hans Wennborg  <hans@chromium.org>
     2
     3        Unreviewed, rolling out r106219.
     4        http://trac.webkit.org/changeset/106219
     5        https://bugs.webkit.org/show_bug.cgi?id=77083
     6
     7        This broke Chromium's test_shell.
     8
     9        * DumpRenderTree/DumpRenderTree.gypi:
     10        * DumpRenderTree/chromium/LayoutTestController.cpp:
     11        (LayoutTestController::addMockSpeechInputResult):
     12        * DumpRenderTree/chromium/LayoutTestController.h:
     13        (WebKit):
     14        (LayoutTestController):
     15        ():
     16        * DumpRenderTree/chromium/MockWebSpeechInputController.cpp: Removed.
     17        * DumpRenderTree/chromium/MockWebSpeechInputController.h: Removed.
     18        * DumpRenderTree/chromium/TestShell.cpp:
     19        * DumpRenderTree/chromium/WebViewHost.cpp:
     20        (WebViewHost::speechInputController):
     21        * DumpRenderTree/chromium/WebViewHost.h:
     22        (WebKit):
     23        (WebViewHost::speechInputControllerMock):
     24        (WebViewHost):
     25        ():
     26
    1272012-01-26  Hans Wennborg  <hans@chromium.org>
    228

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r106219 r106223  
    2323            'chromium/MockSpellCheck.cpp',
    2424            'chromium/MockSpellCheck.h',
    25             'chromium/MockWebSpeechInputController.cpp',
    26             'chromium/MockWebSpeechInputController.h',
    2725            'chromium/NotificationPresenter.h',
    2826            'chromium/NotificationPresenter.cpp',

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

    r106219 r106223  
    3434
    3535#include "DRTDevToolsAgent.h"
    36 #include "MockWebSpeechInputController.h"
    3736#include "TestShell.h"
    3837#include "WebAnimationController.h"
    … …  
    5756#include "WebSettings.h"
    5857#include "platform/WebSize.h"
     58#include "WebSpeechInputControllerMock.h"
    5959#include "platform/WebURL.h"
    6060#include "WebView.h"
    … …  
    19351935        return;
    19361936
    1937     if (MockWebSpeechInputController* controller = m_shell->webViewHost()->speechInputControllerMock())
     1937    if (WebSpeechInputControllerMock* controller = m_shell->webViewHost()->speechInputControllerMock())
    19381938        controller->addMockRecognitionResult(cppVariantToWebString(arguments[0]), arguments[1].toDouble(), cppVariantToWebString(arguments[2]));
    19391939}

  • trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

    r106219 r106223  
    5353namespace WebKit {
    5454class WebGeolocationClientMock;
     55class WebSpeechInputController;
     56class WebSpeechInputControllerMock;
     57class WebSpeechInputListener;
    5558}
    5659
    … …  
    440443    void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
    441444
     445    WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);
    442446    bool shouldDumpAsAudio() const { return m_dumpAsAudio; }
    443447    void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; }
    … …  
    696700    WebKit::WebURL m_userStyleSheetLocation;
    697701
     702    OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;
     703
    698704    // WAV audio data is stored here.
    699705    WebKit::WebArrayBufferView m_audioData;

  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r106219 r106223  
    5353#include "WebSettings.h"
    5454#include "platform/WebSize.h"
     55#include "WebSpeechInputControllerMock.h"
    5556#include "platform/WebString.h"
    5657#include "platform/WebURLRequest.h"

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r106219 r106223  
    3333
    3434#include "LayoutTestController.h"
    35 #include "MockWebSpeechInputController.h"
    3635#include "TestNavigationController.h"
    3736#include "TestShell.h"
    … …  
    5756#include "WebScreenInfo.h"
    5857#include "platform/WebSize.h"
     58#include "WebSpeechInputControllerMock.h"
    5959#include "WebStorageNamespace.h"
    6060#include "WebTextCheckingCompletion.h"
    … …  
    679679{
    680680    if (!m_speechInputControllerMock)
    681         m_speechInputControllerMock = MockWebSpeechInputController::create(listener);
     681        m_speechInputControllerMock = adoptPtr(WebSpeechInputControllerMock::create(listener));
    682682    return m_speechInputControllerMock.get();
    683683}

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r106219 r106223  
    4646
    4747class LayoutTestController;
    48 class MockWebSpeechInputController;
    4948class SkCanvas;
    5049class TestShell;
    … …  
    5958class WebSharedWorkerClient;
    6059class WebSpeechInputController;
     60class WebSpeechInputControllerMock;
    6161class WebSpeechInputListener;
    6262class WebURL;
    … …  
    109109    void clearContextMenuData();
    110110
    111     MockWebSpeechInputController* speechInputControllerMock() { return m_speechInputControllerMock.get(); }
     111    WebKit::WebSpeechInputControllerMock* speechInputControllerMock() { return m_speechInputControllerMock.get(); }
    112112
    113113#if ENABLE(POINTER_LOCK)
    … …  
    383383
    384384    OwnPtr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationClientMock;
    385     OwnPtr<MockWebSpeechInputController> m_speechInputControllerMock;
     385    OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;
    386386
    387387    OwnPtr<WebKit::WebUserMediaClientMock> m_userMediaClientMock;
Note: See TracChangeset for help on using the changeset viewer.