bd267c968e
Add "0002-WPE-GTK-Build-fails-with-ENABLE_WEBDRIVER-OFF.patch", which is a slightly edited version of an upstream patch that fixes building WebKitGTK with ENABLE_WEBDRIVER=OFF. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From fb0f978af0dd3923a1d3bcb6dccf610861e284d3 Mon Sep 17 00:00:00 2001
|
|
From: Adrian Perez de Castro <aperez@igalia.com>
|
|
Date: Tue, 8 Oct 2019 11:06:56 +0300
|
|
Subject: [PATCH xserver 2/2] [WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF
|
|
https://bugs.webkit.org/show_bug.cgi?id=202658
|
|
|
|
Reviewed by NOBODY (OOPS!).
|
|
|
|
* UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Add missing
|
|
ENABLE(WEBDRIVER_MOUSE_INTERACTIONS) and ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
|
|
preprocessor guards.
|
|
* UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp: Ditto.
|
|
|
|
Fetch (and adapted) from: https://bugs.webkit.org/show_bug.cgi?id=202658
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
|
|
|
---
|
|
Source/WebKit/ChangeLog | 12 ++++++++++++
|
|
.../Automation/gtk/WebAutomationSessionGtk.cpp | 4 ++++
|
|
.../Automation/wpe/WebAutomationSessionWPE.cpp | 4 ++++
|
|
3 files changed, 20 insertions(+)
|
|
|
|
diff --git a/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp b/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
|
|
index dd81d1d55ea..ee665c2e346 100644
|
|
--- a/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
|
|
+++ b/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
|
|
@@ -34,6 +34,7 @@
|
|
namespace WebKit {
|
|
using namespace WebCore;
|
|
|
|
+#if ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
|
|
static unsigned modifiersToEventState(OptionSet<WebEvent::Modifier> modifiers)
|
|
{
|
|
unsigned state = 0;
|
|
@@ -131,7 +132,9 @@ void WebAutomationSession::platformSimulateMouseInteraction(WebPageProxy& page,
|
|
break;
|
|
}
|
|
}
|
|
+#endif // ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
|
|
|
|
+#if ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
|
|
static void doKeyStrokeEvent(GdkEventType type, GtkWidget* widget, unsigned keyVal, unsigned state, bool doReleaseAfterPress = false)
|
|
{
|
|
ASSERT(type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE);
|
|
@@ -331,5 +334,6 @@ void WebAutomationSession::platformSimulateKeySequence(WebPageProxy& page, const
|
|
p = g_utf8_next_char(p);
|
|
} while (*p);
|
|
}
|
|
+#endif // ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
|
|
|
|
} // namespace WebKit
|
|
--
|
|
2.23.0
|
|
|