Title: [146016] releases/WebKitGTK/webkit-2.0/Source/WebCore
- Revision
- 146016
- Author
- [email protected]
- Date
- 2013-03-17 11:06:05 -0700 (Sun, 17 Mar 2013)
Log Message
Merge r146010 - [ENCHANT] Invalid charset encoding used for spelling guess context menu items
https://bugs.webkit.org/show_bug.cgi?id=112516
Patch by Carlos Garcia Campos <[email protected]> on 2013-03-17
Reviewed by Gustavo Noronha Silva.
Convert spelling guesses returned by enchant to UTF-16 before
passing them to WebCore.
* platform/text/enchant/TextCheckerEnchant.cpp:
(WebCore::TextCheckerEnchant::getGuessesForWord): Use
String::fromUTF8().
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (146015 => 146016)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-03-17 17:22:42 UTC (rev 146015)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-03-17 18:06:05 UTC (rev 146016)
@@ -1,3 +1,17 @@
+2013-03-17 Carlos Garcia Campos <[email protected]>
+
+ [ENCHANT] Invalid charset encoding used for spelling guess context menu items
+ https://bugs.webkit.org/show_bug.cgi?id=112516
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Convert spelling guesses returned by enchant to UTF-16 before
+ passing them to WebCore.
+
+ * platform/text/enchant/TextCheckerEnchant.cpp:
+ (WebCore::TextCheckerEnchant::getGuessesForWord): Use
+ String::fromUTF8().
+
2013-03-14 Xan Lopez <[email protected]>
[GTK] Wrong ASSERT in AudioDestinationGstreamer::stop
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp (146015 => 146016)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2013-03-17 17:22:42 UTC (rev 146015)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2013-03-17 18:06:05 UTC (rev 146016)
@@ -126,7 +126,7 @@
numberOfSuggestions = maximumNumberOfSuggestions;
for (i = 0; i < numberOfSuggestions; i++)
- guesses.append(String(suggestions[i]));
+ guesses.append(String::fromUTF8(suggestions[i]));
enchant_dict_free_suggestions(*iter, suggestions);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
