Attachment 372462 Details for Bug 199000 – Patch

[patch] Patch

bug-199000-20190619175359.patch (text/plain), 2.75 KB, created by Adrian Perez on 2019-06-19 07:54:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-06-19 07:54:00 PDT

Size: 2.75 KB

patch

obsolete

>Subversion Revision: 246586
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 67c91b123972313f8913974f897af18af598ba14..61eded5a9bbe70eda04ce7e2468804f016e2456a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        * Shared/gtk/WebEventFactory.cpp: Use the GdkEvent union fields for directly accessing
>+        event fields. Use GTK_CHECK_VERSION to guard usage of gdk_event_get_button(),
>+        gdk_event_get_keyval(), and gdk_event_get_keycode(); all of which were added to GTK
>+        in version 3.2.0.
>+        (WebKit::buttonForEvent):
>+        (WebKit::WebEventFactory::createWebMouseEvent):
>+        (WebKit::WebEventFactory::createWebKeyboardEvent):
>+
> 2019-06-19  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [Nicosia] Invalidate SceneIntegration in LayerTreeHost::invalidate()
>diff --git a/Source/WebKit/Shared/gtk/WebEventFactory.cpp b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>index 1f948c6c0864ae5032fcbe09e0a2717e86496b42..f268defc13390aba1edf0bbb2f122fca8329bf3e 100644
>--- a/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>+++ b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>@@ -98,10 +98,10 @@ static inline WebMouseEvent::Button buttonForEvent(const GdkEvent* event)
>     case GDK_3BUTTON_PRESS:
>     case GDK_BUTTON_RELEASE:
>         guint eventButton;
>-#ifndef GTK_API_VERSION_2
>+#if GTK_CHECK_VERSION(3, 2, 0)
>         gdk_event_get_button(event, &eventButton);
> #else
>-        eventButton = event->button;
>+        eventButton = event->button.button;
> #endif
>         if (eventButton == 1)
>             button = WebMouseEvent::LeftButton;
>@@ -152,10 +152,10 @@ WebMouseEvent WebEventFactory::createWebMouseEvent(const GdkEvent* event, int cu
>     gdk_event_get_state(event, &state);
> 
>     guint eventButton;
>-#ifndef GTK_API_VERSION_2
>+#if GTK_CHECK_VERSION(3, 2, 0)
>     gdk_event_get_button(event, &eventButton);
> #else
>-    eventButton = event->button;
>+    eventButton = event->button.button;
> #endif
> 
>     WebEvent::Type type = static_cast<WebEvent::Type>(0);
>@@ -280,12 +280,12 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(const GdkEvent* event,
> {
>     guint keyval;
>     guint16 keycode;
>-#ifndef GTK_API_VERSION_2
>+#if GTK_CHECK_VERSION(3, 2, 0)
>     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);

Actions: View | Formatted Diff | Diff

Attachments on bug 199000: 372462 | 372471