Title: [242345] releases/WebKitGTK/webkit-2.24/Tools
- Revision
- 242345
- Author
- [email protected]
- Date
- 2019-03-04 01:21:45 -0800 (Mon, 04 Mar 2019)
Log Message
Merged r242344 - [WPE] Inline wl_array_for_each to workaround C++ compatibility issue
https://bugs.webkit.org/show_bug.cgi?id=194898
Reviewed by Žan Doberšek.
* wpe/backends/WindowViewBackend.cpp: wl_array_for_each relies on
a GCC extension that permits arithmetic on void* pointer. Inline
the macro until this issue is fixed upstream.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Tools/ChangeLog (242344 => 242345)
--- releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-03-04 08:32:18 UTC (rev 242344)
+++ releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-03-04 09:21:45 UTC (rev 242345)
@@ -1,3 +1,14 @@
+2019-03-04 Charlie Turner <[email protected]>
+
+ [WPE] Inline wl_array_for_each to workaround C++ compatibility issue
+ https://bugs.webkit.org/show_bug.cgi?id=194898
+
+ Reviewed by Žan Doberšek.
+
+ * wpe/backends/WindowViewBackend.cpp: wl_array_for_each relies on
+ a GCC extension that permits arithmetic on void* pointer. Inline
+ the macro until this issue is fixed upstream.
+
2019-02-25 Adrian Perez de Castro <[email protected]>
[WPE] Bump WPEBackend-fdo requirement to API version 1.0
Modified: releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp (242344 => 242345)
--- releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp 2019-03-04 08:32:18 UTC (rev 242344)
+++ releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp 2019-03-04 09:21:45 UTC (rev 242345)
@@ -440,11 +440,16 @@
wpe_view_backend_dispatch_set_size(window.backend(), width, height);
bool isFocused = false;
- void* p;
- wl_array_for_each(p, states)
- {
- uint32_t state = *static_cast<uint32_t*>(p);
+ // FIXME: It would be nice if the following loop could use
+ // wl_array_for_each, but at the time of writing it relies on
+ // GCC specific extension to work properly:
+ // https://gitlab.freedesktop.org/wayland/wayland/issues/34
+ uint32_t* pos = static_cast<uint32_t*>(states->data);
+ uint32_t* end = static_cast<uint32_t*>(states->data) + states->size;
+ for (; pos < end; pos++) {
+ uint32_t state = *pos;
+
switch (state) {
case ZXDG_TOPLEVEL_V6_STATE_ACTIVATED:
isFocused = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
