From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 4 Nov 2010 12:00:17 -0700 Subject: Merge Webkit at r70949: Initial merge by git. Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e --- WebKit/chromium/src/SpeechInputClientImpl.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'WebKit/chromium/src/SpeechInputClientImpl.cpp') diff --git a/WebKit/chromium/src/SpeechInputClientImpl.cpp b/WebKit/chromium/src/SpeechInputClientImpl.cpp index 963d440..b5ed384 100644 --- a/WebKit/chromium/src/SpeechInputClientImpl.cpp +++ b/WebKit/chromium/src/SpeechInputClientImpl.cpp @@ -32,15 +32,21 @@ #include "SpeechInputClientImpl.h" #include "PlatformString.h" +#include "SpeechInputListener.h" #include "WebSpeechInputController.h" #include "WebString.h" #include "WebViewClient.h" -#include "page/SpeechInputListener.h" +#include #if ENABLE(INPUT_SPEECH) namespace WebKit { +PassOwnPtr SpeechInputClientImpl::create(WebViewClient* client) +{ + return adoptPtr(new SpeechInputClientImpl(client)); +} + SpeechInputClientImpl::SpeechInputClientImpl(WebViewClient* web_view_client) : m_controller(web_view_client ? web_view_client->speechInputController(this) : 0) , m_listener(0) @@ -56,10 +62,10 @@ void SpeechInputClientImpl::setListener(WebCore::SpeechInputListener* listener) m_listener = listener; } -bool SpeechInputClientImpl::startRecognition(int requestId, const WebCore::IntRect& elementRect) +bool SpeechInputClientImpl::startRecognition(int requestId, const WebCore::IntRect& elementRect, const AtomicString& language, const String& grammar) { ASSERT(m_listener); - return m_controller->startRecognition(requestId, elementRect); + return m_controller->startRecognition(requestId, elementRect, language, grammar); } void SpeechInputClientImpl::stopRecording(int requestId) @@ -86,10 +92,13 @@ void SpeechInputClientImpl::didCompleteRecognition(int requestId) m_listener->didCompleteRecognition(requestId); } -void SpeechInputClientImpl::setRecognitionResult(int requestId, const WebString& result) +void SpeechInputClientImpl::setRecognitionResult(int requestId, const WebSpeechInputResultArray& results) { ASSERT(m_listener); - m_listener->setRecognitionResult(requestId, result); + WebCore::SpeechInputResultArray webcoreResults(results.size()); + for (size_t i = 0; i < results.size(); ++i) + webcoreResults[i] = results[i]; + m_listener->setRecognitionResult(requestId, webcoreResults); } } // namespace WebKit -- cgit v1.1