Changeset 246597 in webkit

Timestamp:

Jun 19, 2019 10:42:51 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

[GTK] Fix compilation errors for the GTK2 plugin process
​https://bugs.webkit.org/show_bug.cgi?id=199000

Reviewed by Michael Catanzaro.

• Shared/gtk/WebEventFactory.cpp: Use the GdkEvent union fields

when directly accessing event struct fields.
(WebKit::buttonForEvent):
(WebKit::WebEventFactory::createWebMouseEvent):
(WebKit::WebEventFactory::createWebKeyboardEvent):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/gtk/WebEventFactory.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK] Fix compilation errors for the GTK2 plugin process
+        https://bugs.webkit.org/show_bug.cgi?id=199000
+
+        Reviewed by Michael Catanzaro.
+
+        * Shared/gtk/WebEventFactory.cpp: Use the GdkEvent union fields
+        when directly accessing event struct fields.
+        (WebKit::buttonForEvent):
+        (WebKit::WebEventFactory::createWebMouseEvent):
+        (WebKit::WebEventFactory::createWebKeyboardEvent):
+
 2019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp

@@ -102 +102 @@
         gdk_event_get_button(event, &eventButton);
 #else
-        eventButton = event->button;
+        eventButton = event->button.button;
 #endif
         if (eventButton == 1)
@@ -156 +156 @@
     gdk_event_get_button(event, &eventButton);
 #else
-    eventButton = event->button;
+    eventButton = event->button.button;
 #endif
 
@@ -285 +285 @@
     gdk_event_get_keycode(event, &keycode);
 #else
-    keyval = event->keyval;
-    keycode = event->hardware_keycode;
+    keyval = event->key.keyval;
+    keycode = event->key.hardware_keycode;
 #endif
 #if GTK_CHECK_VERSION(3, 10, 0)