Changeset 155436 in webkit

Timestamp:

Sep 10, 2013, 6:36:26 AM (13 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.2/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/TestContextMenu.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-09-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <brian.holt@samsung.com>
 

releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp

@@ -322 +322 @@
             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: