Title: [106475] trunk
- Revision
- 106475
- Author
- [email protected]
- Date
- 2012-02-01 10:29:20 -0800 (Wed, 01 Feb 2012)
Log Message
Rename WebSpeechInputResult::set() to assign()
https://bugs.webkit.org/show_bug.cgi?id=77540
Reviewed by Darin Fisher.
Source/WebKit/chromium:
It was suggested in a previous code review
(https://bugs.webkit.org/show_bug.cgi?id=77083#c5)
that this function should be called assign().
* public/WebSpeechInputResult.h:
(WebSpeechInputResult):
(WebKit::WebSpeechInputResult::set):
* src/WebSpeechInputResult.cpp:
(WebKit::WebSpeechInputResult::assign):
Tools:
* DumpRenderTree/chromium/MockWebSpeechInputController.cpp:
(MockWebSpeechInputController::addMockRecognitionResult):
(MockWebSpeechInputController::speechTaskFired):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (106474 => 106475)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-01 18:04:57 UTC (rev 106474)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-01 18:29:20 UTC (rev 106475)
@@ -1,3 +1,20 @@
+2012-02-01 Hans Wennborg <[email protected]>
+
+ Rename WebSpeechInputResult::set() to assign()
+ https://bugs.webkit.org/show_bug.cgi?id=77540
+
+ Reviewed by Darin Fisher.
+
+ It was suggested in a previous code review
+ (https://bugs.webkit.org/show_bug.cgi?id=77083#c5)
+ that this function should be called assign().
+
+ * public/WebSpeechInputResult.h:
+ (WebSpeechInputResult):
+ (WebKit::WebSpeechInputResult::set):
+ * src/WebSpeechInputResult.cpp:
+ (WebKit::WebSpeechInputResult::assign):
+
2012-02-01 Kent Tamura <[email protected]>
[Chromium] Disable WebFrameTest.FindInPage
Modified: trunk/Source/WebKit/chromium/public/WebSpeechInputResult.h (106474 => 106475)
--- trunk/Source/WebKit/chromium/public/WebSpeechInputResult.h 2012-02-01 18:04:57 UTC (rev 106474)
+++ trunk/Source/WebKit/chromium/public/WebSpeechInputResult.h 2012-02-01 18:29:20 UTC (rev 106475)
@@ -45,7 +45,10 @@
WebSpeechInputResult(const WebSpeechInputResult& other) { assign(other); }
~WebSpeechInputResult() { reset(); }
- WEBKIT_EXPORT void set(const WebString& utterance, double confidence);
+ // 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();
Modified: trunk/Source/WebKit/chromium/src/WebSpeechInputResult.cpp (106474 => 106475)
--- trunk/Source/WebKit/chromium/src/WebSpeechInputResult.cpp 2012-02-01 18:04:57 UTC (rev 106474)
+++ trunk/Source/WebKit/chromium/src/WebSpeechInputResult.cpp 2012-02-01 18:29:20 UTC (rev 106475)
@@ -43,7 +43,7 @@
{
}
-void WebSpeechInputResult::set(const WebString& utterance, double confidence)
+void WebSpeechInputResult::assign(const WebString& utterance, double confidence)
{
m_private = WebCore::SpeechInputResult::create(utterance, confidence);
}
Modified: trunk/Tools/ChangeLog (106474 => 106475)
--- trunk/Tools/ChangeLog 2012-02-01 18:04:57 UTC (rev 106474)
+++ trunk/Tools/ChangeLog 2012-02-01 18:29:20 UTC (rev 106475)
@@ -1,3 +1,14 @@
+2012-02-01 Hans Wennborg <[email protected]>
+
+ Rename WebSpeechInputResult::set() to assign()
+ https://bugs.webkit.org/show_bug.cgi?id=77540
+
+ Reviewed by Darin Fisher.
+
+ * DumpRenderTree/chromium/MockWebSpeechInputController.cpp:
+ (MockWebSpeechInputController::addMockRecognitionResult):
+ (MockWebSpeechInputController::speechTaskFired):
+
2012-02-01 Carlos Garcia Campos <[email protected]>
[GTK] WebKit1 API documentation is not generated when building with gtk-2.0
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp (106474 => 106475)
--- trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp 2012-02-01 18:04:57 UTC (rev 106474)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebSpeechInputController.cpp 2012-02-01 18:29:20 UTC (rev 106475)
@@ -42,7 +42,7 @@
void MockWebSpeechInputController::addMockRecognitionResult(const WebString& result, double confidence, const WebString& language)
{
WebSpeechInputResult res;
- res.set(result, confidence);
+ res.assign(result, confidence);
if (language.isEmpty())
m_resultsForEmptyLanguage.append(res);
@@ -169,7 +169,7 @@
error.append("'");
WebSpeechInputResult res;
- res.set(WebString::fromUTF8(error.utf8().data()), 1.0);
+ res.assign(WebString::fromUTF8(error.utf8().data()), 1.0);
Vector<WebSpeechInputResult> results;
results.append(res);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
