Title: [155436] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 155436
- Author
- [email protected]
- Date
- 2013-09-10 06:36:26 -0700 (Tue, 10 Sep 2013)
Log Message
Merge r155430 - [GTK] /webkit2/WebKitWebView/default-menu fails when GtkSettings:gtk-show-input-method-menu is disabled
https://bugs.webkit.org/show_bug.cgi?id=121088
Reviewed by Xan Lopez.
* UIProcess/API/gtk/tests/TestContextMenu.cpp: Always check
Unicode submenu is present in default context menu for editable
content.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (155435 => 155436)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-10 13:32:39 UTC (rev 155435)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-10 13:36:26 UTC (rev 155436)
@@ -1,3 +1,14 @@
+2013-09-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] /webkit2/WebKitWebView/default-menu fails when GtkSettings:gtk-show-input-method-menu is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=121088
+
+ Reviewed by Xan Lopez.
+
+ * UIProcess/API/gtk/tests/TestContextMenu.cpp: Always check
+ Unicode submenu is present in default context menu for editable
+ content.
+
2013-08-29 Brian Holt <[email protected]>
[GTK] [WK2] TestWebKitWebView page-visibility fails
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp (155435 => 155436)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 13:32:39 UTC (rev 155435)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 13:36:26 UTC (rev 155436)
@@ -321,11 +321,10 @@
iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_DELETE, Visible);
iter = checkCurrentItemIsSeparatorAndGetNext(iter);
iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_SELECT_ALL, Visible | Enabled);
- if (shouldShowInputMethodsMenu()) {
- iter = checkCurrentItemIsSeparatorAndGetNext(iter);
+ iter = checkCurrentItemIsSeparatorAndGetNext(iter);
+ if (shouldShowInputMethodsMenu())
iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_INPUT_METHODS, Visible | Enabled);
- iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_UNICODE, Visible | Enabled);
- }
+ iter = checkCurrentItemIsStockActionAndGetNext(iter, WEBKIT_CONTEXT_MENU_ACTION_UNICODE, Visible | Enabled);
break;
default:
g_assert_not_reached();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
