Attachment 372471 Details for Bug 199000 – Patch v2

[patch] Patch v2

bug-199000-20190619201725.patch (text/plain), 2.26 KB, created by Adrian Perez on 2019-06-19 10:17:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-06-19 10:17:26 PDT

Size: 2.26 KB

patch

obsolete

>Subversion Revision: 246586
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 67c91b123972313f8913974f897af18af598ba14..6f6fa23344db9dd3173bf9d1092f60974de9962c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+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
>+        when directly accessing event struct fields.
>+        (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..54cdf62a75a9ae9cc768daeb89b96a6d658ea1f6 100644
>--- a/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>+++ b/Source/WebKit/Shared/gtk/WebEventFactory.cpp
>@@ -101,7 +101,7 @@ static inline WebMouseEvent::Button buttonForEvent(const GdkEvent* event)
> #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 @@ WebMouseEvent WebEventFactory::createWebMouseEvent(const GdkEvent* event, int cu
> #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 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(const GdkEvent* event,
>     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