Title: [246597] trunk/Source/WebKit
- Revision
- 246597
- Author
- [email protected]
- Date
- 2019-06-19 10:42:51 -0700 (Wed, 19 Jun 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246596 => 246597)
--- trunk/Source/WebKit/ChangeLog 2019-06-19 17:42:05 UTC (rev 246596)
+++ trunk/Source/WebKit/ChangeLog 2019-06-19 17:42:51 UTC (rev 246597)
@@ -1,5 +1,18 @@
2019-06-19 Adrian Perez de Castro <[email protected]>
+ [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 <[email protected]>
+
[WPE][GTK] Fix build with unified sources disabled
https://bugs.webkit.org/show_bug.cgi?id=198752
Modified: trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp (246596 => 246597)
--- trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-06-19 17:42:05 UTC (rev 246596)
+++ trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp 2019-06-19 17:42:51 UTC (rev 246597)
@@ -101,7 +101,7 @@
#ifndef GTK_API_VERSION_2
gdk_event_get_button(event, &eventButton);
#else
- eventButton = event->button;
+ eventButton = event->button.button;
#endif
if (eventButton == 1)
button = WebMouseEvent::LeftButton;
@@ -155,7 +155,7 @@
#ifndef GTK_API_VERSION_2
gdk_event_get_button(event, &eventButton);
#else
- eventButton = event->button;
+ eventButton = event->button.button;
#endif
WebEvent::Type type = static_cast<WebEvent::Type>(0);
@@ -284,8 +284,8 @@
gdk_event_get_keyval(event, &keyval);
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)
GdkEventType type = gdk_event_get_event_type(event);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
