[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b043676b68bb22d0db06c43ec747c5300ce4ba16
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 23 16:37:01 2010 +0000

    2010-08-23  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Remove obsolete public/API methods in chromium port
            https://bugs.webkit.org/show_bug.cgi?id=44421
    
            * public/WebSpeechInputController.h:
            (WebKit::WebSpeechInputController::startRecognition):
            (WebKit::WebSpeechInputController::cancelRecognition):
            (WebKit::WebSpeechInputController::stopRecording):
            * public/WebSpeechInputListener.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65815 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index fb2599f..e3a90c2 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-23  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Remove obsolete public/API methods in chromium port
+        https://bugs.webkit.org/show_bug.cgi?id=44421
+
+        * public/WebSpeechInputController.h:
+        (WebKit::WebSpeechInputController::startRecognition):
+        (WebKit::WebSpeechInputController::cancelRecognition):
+        (WebKit::WebSpeechInputController::stopRecording):
+        * public/WebSpeechInputListener.h:
+
 2010-08-22  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/public/WebSpeechInputController.h b/WebKit/chromium/public/WebSpeechInputController.h
index b85fde6..9aedb6f 100644
--- a/WebKit/chromium/public/WebSpeechInputController.h
+++ b/WebKit/chromium/public/WebSpeechInputController.h
@@ -43,29 +43,20 @@ public:
     // text are returned via the listener interface.
     virtual bool startRecognition(int)
     {
-        return startRecognition();
-    }
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual bool startRecognition()
-    {
         WEBKIT_ASSERT_NOT_REACHED();
         return false;
     }
 
     // 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() { }
diff --git a/WebKit/chromium/public/WebSpeechInputListener.h b/WebKit/chromium/public/WebSpeechInputListener.h
index e779c3a..6dc3d49 100644
--- a/WebKit/chromium/public/WebSpeechInputListener.h
+++ b/WebKit/chromium/public/WebSpeechInputListener.h
@@ -48,33 +48,18 @@ public:
     // Typically after this call the listener would update the UI to reflect that recognition is
     // in progress.
     virtual void didCompleteRecording(int) = 0;
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual void didCompleteRecording()
-    {
-        didCompleteRecording(1);
-    }
 
     // Gives results from speech recognition, either partial or the final results.
     // This method can potentially get called multiple times if there are partial results
     // available as the user keeps speaking. If the speech could not be recognized properly
     // or if there was any other errors in the process, this method may never be called.
     virtual void setRecognitionResult(int, const WebString&) = 0;
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual void setRecognitionResult(const WebString& result)
-    {
-        setRecognitionResult(1, result);
-    }
 
     // Informs that speech recognition has completed. This gets invoked irrespective of whether
     // recognition was succesful or not, whether setRecognitionResult() was invoked or not. The
     // handler typically frees up any temporary resources allocated and waits for the next speech
     // recognition request.
     virtual void didCompleteRecognition(int) = 0;
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual void didCompleteRecognition()
-    {
-        didCompleteRecognition(1);
-    }
 
 protected:
     ~WebSpeechInputListener() { }

-- 
WebKit Debian packaging