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

satish at chromium.org satish at chromium.org
Wed Dec 22 12:58:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 1f5d89f4aef13be26a24c0e43b31acc51234141d
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 05:22:07 2010 +0000

    2010-09-02  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=45108
    
            * public/WebSpeechInputController.h:
            (WebKit::WebSpeechInputController::startRecognition):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bffb243..659a011 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-02  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=45108
+
+        * public/WebSpeechInputController.h:
+        (WebKit::WebSpeechInputController::startRecognition):
+
 2010-09-02  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebSpeechInputController.h b/WebKit/chromium/public/WebSpeechInputController.h
index 0315722..5408741 100644
--- a/WebKit/chromium/public/WebSpeechInputController.h
+++ b/WebKit/chromium/public/WebSpeechInputController.h
@@ -45,11 +45,6 @@ public:
     // text are returned via the listener interface.
     virtual bool startRecognition(int requestId, const WebRect&)
     {
-        return startRecognition(requestId);
-    }
-    // FIXME: Remove this once chromium has picked up this change.
-    virtual bool startRecognition(int)
-    {
         WEBKIT_ASSERT_NOT_REACHED();
         return false;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list