[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 16:25:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c6f6c076d033d8aa05527b30070f41ca46664545
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 13:04:20 2010 +0000

    2010-11-23  Satish Sampath  <satish at chromium.org>
    
            Unreviewed, chromium build fix.
    
            * public/WebSpeechInputControllerMock.h:
            (WebKit::WebSpeechInputControllerMock::setMockRecognitionResult):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d8ba4b1..fc3adfe 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  Satish Sampath  <satish at chromium.org>
+
+        Unreviewed, chromium build fix.
+
+        * public/WebSpeechInputControllerMock.h:
+        (WebKit::WebSpeechInputControllerMock::setMockRecognitionResult):
+
 2010-11-18  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/public/WebSpeechInputControllerMock.h b/WebKit/chromium/public/WebSpeechInputControllerMock.h
index e440b89..3022f38 100644
--- a/WebKit/chromium/public/WebSpeechInputControllerMock.h
+++ b/WebKit/chromium/public/WebSpeechInputControllerMock.h
@@ -44,6 +44,12 @@ public:
         WebSpeechInputListener* listener);
     virtual ~WebSpeechInputControllerMock() { }
 
+    // FIXME: Remove this method once chromium starts using the one below.
+    void setMockRecognitionResult(const WebString& result, const WebString& language)
+    {
+        addMockRecognitionResult(result, 1.0, language);
+    }
+
     virtual void addMockRecognitionResult(const WebString& result, double confidence, const WebString& language) = 0;
 
     virtual void clearResults() = 0;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list