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

[satish at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2c350db35f52e70d9c2284d141724bb873c5557b
Author: satish at chromium.org <satish at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 12:56:16 2010 +0000

    2010-11-01  Leandro Gracia Gil  <leandrogracia at google.com>
    
            Reviewed by Jeremy Orlow.
    
            This is the last part of a 4-sided patch for the language attribute
            in speech text buttons. This patch removes what now is dead code
            and re-enables the layout test introduced by bug 47089.
            https://bugs.webkit.org/show_bug.cgi?id=47420
    
            * platform/chromium/test_expectations.txt:
    2010-11-01  Leandro Gracia Gil  <leandrogracia at google.com>
    
            Reviewed by Jeremy Orlow.
    
            This is the last part of a 4-sided patch for the language attribute
            in speech text buttons. This patch removes what now is dead code
            and re-enables the layout test introduced by bug 47089.
            https://bugs.webkit.org/show_bug.cgi?id=47420
    
            * public/WebSpeechInputControllerMock.h:
            * src/WebSpeechInputControllerMockImpl.cpp:
            * src/WebSpeechInputControllerMockImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 024417e..ba62cd3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-01  Leandro Gracia Gil  <leandrogracia at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        This is the last part of a 4-sided patch for the language attribute
+        in speech text buttons. This patch removes what now is dead code
+        and re-enables the layout test introduced by bug 47089.
+        https://bugs.webkit.org/show_bug.cgi?id=47420
+
+        * platform/chromium/test_expectations.txt:
+
 2010-11-01  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: simplify styles test to make all bots happy.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 1da703f..be92ae9 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3246,9 +3246,6 @@ BUGWK61164 LINUX WIN : fast/blockflow/background-vertical-rl.html = IMAGE+TEXT
 // New test added by http://trac.webkit.org/changeset/70840.
 BUGWK61188 : fast/repaint/iframe-scroll-repaint.html = IMAGE+TEXT IMAGE
 
-// Temporarily disabled for a 4-sided patch. Will be enabled again by BUGWK47420.
-BUGWK47089 : fast/speech/input-text-language-tag.html = FAIL
-
 // These tests started failing presumably after r70850
 BUGWK48627 MAC : fast/invalid/missing-end-tag.xhtml = IMAGE
 BUGWK48627 MAC : svg/custom/createImageElement2.xhtml = IMAGE
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 07e4f70..e6f11ca 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-01  Leandro Gracia Gil  <leandrogracia at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        This is the last part of a 4-sided patch for the language attribute
+        in speech text buttons. This patch removes what now is dead code
+        and re-enables the layout test introduced by bug 47089.
+        https://bugs.webkit.org/show_bug.cgi?id=47420
+
+        * public/WebSpeechInputControllerMock.h:
+        * src/WebSpeechInputControllerMockImpl.cpp:
+        * src/WebSpeechInputControllerMockImpl.h:
+
 2010-10-31  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/chromium/public/WebSpeechInputControllerMock.h b/WebKit/chromium/public/WebSpeechInputControllerMock.h
index b4c50a0..0a7f6f9 100644
--- a/WebKit/chromium/public/WebSpeechInputControllerMock.h
+++ b/WebKit/chromium/public/WebSpeechInputControllerMock.h
@@ -45,10 +45,6 @@ public:
     virtual ~WebSpeechInputControllerMock() { }
 
     virtual void setMockRecognitionResult(const WebString& result, const WebString& language) = 0;
-
-    // FIXME: this is a fix for a two-sided patch. Delete as soon as the chromium side is patched.
-    // Chromium patch not uploaded yet, but will depend on http://codereview.chromium.org/3615005/show patch.
-    virtual void setMockRecognitionResult(const WebString& result) = 0;
 };
 
 } // namespace WebKit
diff --git a/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp b/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp
index 3b56338..ce8eba6 100644
--- a/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp
+++ b/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp
@@ -55,11 +55,6 @@ WebSpeechInputControllerMockImpl::~WebSpeechInputControllerMockImpl()
     m_webcoreMock->setListener(0);
 }
 
-void WebSpeechInputControllerMockImpl::setMockRecognitionResult(const WebString& result)
-{
-    m_webcoreMock->setRecognitionResult(result, WebString::fromUTF8(""));
-}
-
 void WebSpeechInputControllerMockImpl::setMockRecognitionResult(const WebString& result, const WebString &language)
 {
     m_webcoreMock->setRecognitionResult(result, language);
diff --git a/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h b/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h
index c98f92a..7b50a8b 100644
--- a/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h
+++ b/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h
@@ -64,10 +64,6 @@ public:
     // WebSpeechInputControllerMock methods.
     void setMockRecognitionResult(const WebString& result, const WebString& language);
 
-    // FIXME: this is a fix for a two-sided patch. Delete as soon as the chromium side is patched.
-    // Chromium patch not uploaded yet, but will depend on http://codereview.chromium.org/3615005/show patch.
-    void setMockRecognitionResult(const WebString& result);
-
 private:
     OwnPtr<WebCore::SpeechInputClientMock> m_webcoreMock;
     WebSpeechInputListener* m_listener;

-- 
WebKit Debian packaging