Title: [155430] trunk/Source/WebKit2
- Revision
- 155430
- Author
- [email protected]
- Date
- 2013-09-10 03:02:07 -0700 (Tue, 10 Sep 2013)
Log Message
[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: trunk/Source/WebKit2/ChangeLog (155429 => 155430)
--- trunk/Source/WebKit2/ChangeLog 2013-09-10 09:41:04 UTC (rev 155429)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-10 10:02:07 UTC (rev 155430)
@@ -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-09-09 Dean Jackson <[email protected]>
[WebGL] Allow multithreaded OpenGL contexts
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp (155429 => 155430)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 09:41:04 UTC (rev 155429)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp 2013-09-10 10:02:07 UTC (rev 155430)
@@ -338,11 +338,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
