Title: [146018] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 146018
- Author
- [email protected]
- Date
- 2013-03-17 11:11:03 -0700 (Sun, 17 Mar 2013)
Log Message
Merge r146011 - [GTK] Invalid charset encoding using when substituting a misspelled word in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=112517
Patch by Carlos Garcia Campos <[email protected]> on 2013-03-17
Reviewed by Alexey Proskuryakov.
The problem is that we are creating the WebContextMenuItemData
with the GtkAction label as UTF-8.
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::contextMenuItemActivatedCallback): Use String::fromUTF8()
to convert the GtkAction label to UTF-16.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (146017 => 146018)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-17 18:10:25 UTC (rev 146017)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-17 18:11:03 UTC (rev 146018)
@@ -1,3 +1,17 @@
+2013-03-17 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Invalid charset encoding using when substituting a misspelled word in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=112517
+
+ Reviewed by Alexey Proskuryakov.
+
+ The problem is that we are creating the WebContextMenuItemData
+ with the GtkAction label as UTF-8.
+
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::contextMenuItemActivatedCallback): Use String::fromUTF8()
+ to convert the GtkAction label to UTF-16.
+
2013-03-14 Carlos Garcia Campos <[email protected]>
Unreviewed build fix. Add missing file.
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (146017 => 146018)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2013-03-17 18:10:25 UTC (rev 146017)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2013-03-17 18:11:03 UTC (rev 146018)
@@ -47,9 +47,9 @@
{
gboolean isToggle = GTK_IS_TOGGLE_ACTION(action);
WebKit::WebContextMenuItemData item(isToggle ? WebCore::CheckableActionType : WebCore::ActionType,
- static_cast<WebCore::ContextMenuAction>(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), gContextMenuActionId))),
- gtk_action_get_label(action), gtk_action_get_sensitive(action),
- isToggle ? gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) : false);
+ static_cast<WebCore::ContextMenuAction>(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), gContextMenuActionId))),
+ String::fromUTF8(gtk_action_get_label(action)), gtk_action_get_sensitive(action),
+ isToggle ? gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) : false);
page->contextMenuItemSelected(item);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
