Title: [251700] releases/WebKitGTK/webkit-2.26/Source/WebKit
- Revision
- 251700
- Author
- [email protected]
- Date
- 2019-10-29 07:53:38 -0700 (Tue, 29 Oct 2019)
Log Message
Merge r250818 - [WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF
https://bugs.webkit.org/show_bug.cgi?id=202658
Reviewed by Carlos Garcia Campos.
* UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Add missing
ENABLE(WEBDRIVER_MOUSE_INTERACTIONS) and ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
preprocessor guards.
* UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp: Ditto.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog (251699 => 251700)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2019-10-29 14:50:07 UTC (rev 251699)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2019-10-29 14:53:38 UTC (rev 251700)
@@ -1,3 +1,15 @@
+2019-10-08 Adrian Perez de Castro <[email protected]>
+
+ [WPE][GTK] Build fails with ENABLE_WEBDRIVER=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=202658
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Add missing
+ ENABLE(WEBDRIVER_MOUSE_INTERACTIONS) and ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
+ preprocessor guards.
+ * UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp: Ditto.
+
2019-09-24 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.26.1 release
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (251699 => 251700)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp 2019-10-29 14:50:07 UTC (rev 251699)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp 2019-10-29 14:53:38 UTC (rev 251700)
@@ -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 @@
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 @@
p = g_utf8_next_char(p);
} while (*p);
}
+#endif // ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp (251699 => 251700)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp 2019-10-29 14:50:07 UTC (rev 251699)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/Automation/wpe/WebAutomationSessionWPE.cpp 2019-10-29 14:53:38 UTC (rev 251700)
@@ -32,6 +32,7 @@
namespace WebKit {
using namespace WebCore;
+#if ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
static uint32_t modifiersToEventState(OptionSet<WebEvent::Modifier> modifiers)
{
uint32_t state = 0;
@@ -121,7 +122,9 @@
break;
}
}
+#endif // ENABLE(WEBDRIVER_MOUSE_INTERACTIONS)
+#if ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
static void doKeyStrokeEvent(struct wpe_view_backend* viewBackend, bool pressed, uint32_t keyCode, uint32_t modifiers, bool doReleaseAfterPress = false)
{
struct wpe_input_xkb_keymap_entry* entries;
@@ -309,6 +312,7 @@
p = g_utf8_next_char(p);
} while (*p);
}
+#endif // ENABLE(WEBDRIVER_KEYBOARD_INTERACTIONS)
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
