Chromium: remove WebSpeechInputResult::set

https://bugs.webkit.org/show_bug.cgi?id=77977

Reviewed by Darin Fisher.

It was renamed to assign() in r106475.

Source/WebKit/chromium:

* public/WebSpeechInputResult.h:

Tools:

* DumpRenderTree/chromium/MockWebSpeechInputController.cpp:
(makeRectResult):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 213dcfc..bbd3016 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-07  Hans Wennborg  <hans@chromium.org>
+
+        Chromium: remove WebSpeechInputResult::set
+        https://bugs.webkit.org/show_bug.cgi?id=77977
+
+        Reviewed by Darin Fisher.
+
+        It was renamed to assign() in r106475.
+
+        * public/WebSpeechInputResult.h:
+
 2012-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r106935.

diff --git a/Source/WebKit/chromium/public/WebSpeechInputResult.h b/Source/WebKit/chromium/public/WebSpeechInputResult.h
index 82eb74a..db4a7c6 100644 (file)
--- a/Source/WebKit/chromium/public/WebSpeechInputResult.h
+++ b/Source/WebKit/chromium/public/WebSpeechInputResult.h
@@ -45,9 +45,6 @@ public:
     WebSpeechInputResult(const WebSpeechInputResult& other) { assign(other); }
     ~WebSpeechInputResult() { reset(); }
 
-    // FIXME: Remove this when Chromium has been updated.
-    void set(const WebString& utterance, double confidence) { assign(utterance, confidence); }
-
     WEBKIT_EXPORT void assign(const WebString& utterance, double confidence);
     WEBKIT_EXPORT void assign(const WebSpeechInputResult& other);
     WEBKIT_EXPORT void reset();

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 02e5948..f9c75ef 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2012-02-07  Hans Wennborg  <hans@chromium.org>
+
+        Chromium: remove WebSpeechInputResult::set
+        https://bugs.webkit.org/show_bug.cgi?id=77977
+
+        Reviewed by Darin Fisher.
+
+        It was renamed to assign() in r106475.
+
+        * DumpRenderTree/chromium/MockWebSpeechInputController.cpp:
+        (makeRectResult):
+
 2012-02-07  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 
         [Qt] Give emulated touch-point a radius

diff --git a/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp b/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp
index 0bea45b..a5fe3ed 100644 (file)
--- a/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp
+++ b/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp
@@ -124,7 +124,7 @@ static WebSpeechInputResultArray makeRectResult(const WebRect& rect)
     sb.append(String::number(rect.height));
 
     WebSpeechInputResult res;
-    res.set(WebString(sb.characters(), sb.length()), 1.0);
+    res.assign(WebString(sb.characters(), sb.length()), 1.0);
 
     WebSpeechInputResultArray results;
     results.assign(&res, 1);