Changeset 223130 in webkit

Timestamp:

Oct 10, 2017 5:47:00 AM (7 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE] Build failure due to invalid cast of EGLNativeWindowType when targetting 64-bit ARM
​https://bugs.webkit.org/show_bug.cgi?id=178090

Reviewed by Žan Doberšek.

• WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:

(WebKit::AcceleratedSurfaceWPE::window const): Use static_cast instead of reinterpret_cast,
this way extending values of EGLNativeWindowType to 64 bits is allowed.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Build failure due to invalid cast of EGLNativeWindowType when targetting 64-bit ARM
+        https://bugs.webkit.org/show_bug.cgi?id=178090
+
+        Reviewed by Žan Doberšek.
+
+        * WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:
+        (WebKit::AcceleratedSurfaceWPE::window const): Use static_cast instead of reinterpret_cast,
+        this way extending values of EGLNativeWindowType to 64 bits is allowed.
+
 2017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp

@@ -76 +76 @@
 {
     ASSERT(m_backend);
-    return reinterpret_cast<uint64_t>(wpe_renderer_backend_egl_target_get_native_window(m_backend));
+    static_assert(sizeof(EGLNativeWindowType) <= sizeof(uint64_t), "EGLNativeWindowType must not be longer than 64 bits.");
+    return static_cast<uint64_t>(wpe_renderer_backend_egl_target_get_native_window(m_backend));
 }