Changeset 242345 in webkit

Timestamp:

Mar 4, 2019, 1:21:45 AM (7 years ago)

Author:

Adrian Perez de Castro

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.

Location:

releases/WebKitGTK/webkit-2.24/Tools

Files:

• ChangeLog (modified) (1 diff)
• wpe/backends/WindowViewBackend.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Tools/ChangeLog

@@ +1 @@
+2019-03-04  Charlie Turner  <cturner@igalia.com>
+
+        [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  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp

@@ -441 +441 @@
 
         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) {