1 files changed, 7 insertions, 9 deletions

diff --git a/WebKit/chromium/public/WebSpeechInputController.h b/WebKit/chromium/public/WebSpeechInputController.h
index b85fde6..0315722 100644
--- a/WebKit/chromium/public/WebSpeechInputController.h
+++ b/WebKit/chromium/public/WebSpeechInputController.h
@@ -35,18 +35,20 @@
 
 namespace WebKit {
 
+struct WebRect;
+
 // Provides an embedder API called by WebKit.
 class WebSpeechInputController {
 public:
     // Starts speech recognition. Speech will get recorded until the endpointer detects silence,
     // runs to the limit or stopRecording is called. Progress indications and the recognized
     // text are returned via the listener interface.
-    virtual bool startRecognition(int)
+    virtual bool startRecognition(int requestId, const WebRect&)
     {
-        return startRecognition();
+        return startRecognition(requestId);
     }
     // FIXME: Remove this once chromium has picked up this change.
-    virtual bool startRecognition()
+    virtual bool startRecognition(int)
     {
         WEBKIT_ASSERT_NOT_REACHED();
         return false;
@@ -54,18 +56,14 @@ public:
 
     // Cancels an ongoing recognition and discards any audio recorded so far. No partial
     // recognition results are returned to the listener.
-    virtual void cancelRecognition(int) { cancelRecognition(); }
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual void cancelRecognition() { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void cancelRecognition(int) { WEBKIT_ASSERT_NOT_REACHED(); }
 
     // Stops audio recording and performs recognition with the audio recorded until now
     // (does not discard audio). This is an optional call and is typically invoked if the user
     // wants to stop recording audio as soon as they finished speaking. Otherwise, the speech
     // recording 'endpointer' should detect silence in the input and stop recording automatically.
     // Call startRecognition() to record audio and recognize speech again.
-    virtual void stopRecording(int) { stopRecording(); }
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual void stopRecording() { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void stopRecording(int) { WEBKIT_ASSERT_NOT_REACHED(); }
 
 protected:
     virtual ~WebSpeechInputController() { }