[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:28:31 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit cb2227f3b24a59179efac6a654d17e5368d09a69
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 12:29:25 2010 +0000

    2010-11-24  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Steve Block.
    
            Re-enabled layout tests which were disabled during an API migration.
            https://bugs.webkit.org/show_bug.cgi?id=50013
    
            * platform/chromium/test_expectations.txt:
    2010-11-24  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Steve Block.
    
            Remove API migration code which is no longer used.
            https://bugs.webkit.org/show_bug.cgi?id=50013
    
            * public/WebSpeechInputControllerMock.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 642190a..85b4494 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-24  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Steve Block.
+
+        Re-enabled layout tests which were disabled during an API migration.
+        https://bugs.webkit.org/show_bug.cgi?id=50013
+
+        * platform/chromium/test_expectations.txt:
+
 2010-11-24  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Unreviewed. chromium expectation fix.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 692c481..c4c7979 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3191,12 +3191,6 @@ BUGCR64129 MAC DEBUG : fast/files/revoke-blob-url.html = CRASH PASS
 // Test added with http://trac.webkit.org/changeset/72504 needs better expectations for Chromium.
 BUGWK4989 WIN LINUX : fast/css/font-face-data-uri.html = TEXT
 
-// Remove these once the Chromium side has caught on with multiple speech input results.
-BUG49736 : fast/speech/input-onspeechchange-event.html = TIMEOUT
-BUG49736 : fast/speech/input-text-language-tag.html = TIMEOUT
-BUG49736 : fast/speech/input-text-speechbutton.html = TIMEOUT
-BUG49736 : fast/speech/speech-button-ignore-generated-events.html = TIMEOUT
-
 // Disable font-size-zero test for mac platform. The problem was introduced at r72567.
 BUG49967 MAC : fast/text/font-size-zero.html = TEXT
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c360fc9..912ab7f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-24  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Steve Block.
+
+        Remove API migration code which is no longer used.
+        https://bugs.webkit.org/show_bug.cgi?id=50013
+
+        * public/WebSpeechInputControllerMock.h:
+
 2010-11-23  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72628.
diff --git a/WebKit/chromium/public/WebSpeechInputControllerMock.h b/WebKit/chromium/public/WebSpeechInputControllerMock.h
index 3022f38..e440b89 100644
--- a/WebKit/chromium/public/WebSpeechInputControllerMock.h
+++ b/WebKit/chromium/public/WebSpeechInputControllerMock.h
@@ -44,12 +44,6 @@ 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