Changeset 71019 in webkit

Timestamp:

Nov 1, 2010 5:56:16 AM (13 years ago)

Author:

satish@chromium.org

Message:

2010-11-01 Leandro Gracia Gil <​leandrogracia@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@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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebSpeechInputControllerMock.h (modified) (1 diff)
• WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebSpeechInputControllerMockImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-01  Leandro Gracia Gil  <leandrogracia@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@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3247 +3247 @@
 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

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-11-01  Leandro Gracia Gil  <leandrogracia@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@chromium.org>
 

trunk/WebKit/chromium/public/WebSpeechInputControllerMock.h

@@ -46 +46 @@
 
     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;
 };
 

trunk/WebKit/chromium/src/WebSpeechInputControllerMockImpl.cpp

@@ -56 +56 @@
 }
 
-void WebSpeechInputControllerMockImpl::setMockRecognitionResult(const WebString& result)
-{
-    m_webcoreMock->setRecognitionResult(result, WebString::fromUTF8(""));
-}
-
 void WebSpeechInputControllerMockImpl::setMockRecognitionResult(const WebString& result, const WebString &language)
 {

trunk/WebKit/chromium/src/WebSpeechInputControllerMockImpl.h

@@ -65 +65 @@
     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;