Title: [262485] trunk/Source/WebKit
Revision
262485
Author
carlo...@webkit.org
Date
2020-06-03 06:48:05 -0700 (Wed, 03 Jun 2020)

Log Message

[GTK4] WTR: Forward key events to the active popup menu
https://bugs.webkit.org/show_bug.cgi?id=212690

Reviewed by Adrian Perez de Castro.

I forgot to remove the ifdefs when added support for popup menus in r262414.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseSynthesizeKeyEvent):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (262484 => 262485)


--- trunk/Source/WebKit/ChangeLog	2020-06-03 13:46:37 UTC (rev 262484)
+++ trunk/Source/WebKit/ChangeLog	2020-06-03 13:48:05 UTC (rev 262485)
@@ -1,5 +1,17 @@
 2020-06-03  Carlos Garcia Campos  <cgar...@igalia.com>
 
+        [GTK4] WTR: Forward key events to the active popup menu
+        https://bugs.webkit.org/show_bug.cgi?id=212690
+
+        Reviewed by Adrian Perez de Castro.
+
+        I forgot to remove the ifdefs when added support for popup menus in r262414.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseSynthesizeKeyEvent):
+
+2020-06-03  Carlos Garcia Campos  <cgar...@igalia.com>
+
         [GTK4] Fix input methods
         https://bugs.webkit.org/show_bug.cgi?id=212317
 

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (262484 => 262485)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2020-06-03 13:46:37 UTC (rev 262484)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp	2020-06-03 13:48:05 UTC (rev 262485)
@@ -2571,7 +2571,6 @@
         return;
 
     if (type != KeyEventType::Release) {
-#if !USE(GTK4)
         if (auto* popupMenu = priv->pageProxy->activePopupMenu()) {
             auto* gtkPopupMenu = static_cast<WebPopupMenuProxyGtk*>(popupMenu);
             if (gtkPopupMenu->handleKeyPress(keyval, GDK_CURRENT_TIME))
@@ -2582,7 +2581,6 @@
                 return;
             }
         }
-#endif
 
 #if ENABLE(FULLSCREEN_API)
         if (priv->fullScreenModeActive) {
@@ -2598,12 +2596,10 @@
         }
 #endif
 
-#if !USE(GTK4)
         if (keyval == GDK_KEY_Menu) {
             webkitWebViewBasePopupMenu(GTK_WIDGET(webViewBase));
             return;
         }
-#endif
     }
 
     auto keycode = widgetKeyvalToKeycode(GTK_WIDGET(webViewBase), keyval);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to