summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/speech_input_dispatcher.cc8
-rw-r--r--chrome/renderer/speech_input_dispatcher.h7
2 files changed, 14 insertions, 1 deletions
diff --git a/chrome/renderer/speech_input_dispatcher.cc b/chrome/renderer/speech_input_dispatcher.cc
index 88ea447..dbe9ff8 100644
--- a/chrome/renderer/speech_input_dispatcher.cc
+++ b/chrome/renderer/speech_input_dispatcher.cc
@@ -5,10 +5,10 @@
#include "chrome/renderer/speech_input_dispatcher.h"
#include "chrome/renderer/render_view.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSpeechInputListener.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
using WebKit::WebFrame;
@@ -34,6 +34,12 @@ bool SpeechInputDispatcher::OnMessageReceived(const IPC::Message& message) {
}
bool SpeechInputDispatcher::startRecognition(
+ int request_id, const WebKit::WebString& language,
+ const WebKit::WebRect& element_rect) {
+ return startRecognition(request_id, element_rect);
+}
+
+bool SpeechInputDispatcher::startRecognition(
int request_id, const WebKit::WebRect& element_rect) {
LOG(INFO) << "SpeechInputDispatcher::startRecognition enter";
gfx::Size scroll = render_view_->webview()->mainFrame()->scrollOffset();
diff --git a/chrome/renderer/speech_input_dispatcher.h b/chrome/renderer/speech_input_dispatcher.h
index 188acaa..ec9333f 100644
--- a/chrome/renderer/speech_input_dispatcher.h
+++ b/chrome/renderer/speech_input_dispatcher.h
@@ -13,6 +13,7 @@ class GURL;
class RenderView;
namespace WebKit {
+class WebString;
struct WebRect;
class WebSpeechInputListener;
}
@@ -29,7 +30,13 @@ class SpeechInputDispatcher : public WebKit::WebSpeechInputController {
bool OnMessageReceived(const IPC::Message& msg);
// WebKit::WebSpeechInputController.
+ // TODO(leandro): this is a temporary fix for a two-sided patch.
+ // https://bugs.webkit.org/show_bug.cgi?id=47089
+ bool startRecognition(int request_id, const WebKit::WebString& language,
+ const WebKit::WebRect& element_rect);
+
bool startRecognition(int request_id, const WebKit::WebRect& element_rect);
+
void cancelRecognition(int request_id);
void stopRecording(int request_id);