Changeset 223150 in webkit

Timestamp:

Oct 10, 2017 3:37:41 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r223130.
​https://bugs.webkit.org/show_bug.cgi?id=178147

Breaks the build when EGLNativeWindowType is a pointer
(Requested by aperezdc on #webkit).

Reverted changeset:

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

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  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r223130.
+        https://bugs.webkit.org/show_bug.cgi?id=178147
+
+        Breaks the build when EGLNativeWindowType is a pointer
+        (Requested by aperezdc on #webkit).
+
+        Reverted changeset:
+
+        "[WPE] Build failure due to invalid cast of
+        EGLNativeWindowType when targetting 64-bit ARM"
+        https://bugs.webkit.org/show_bug.cgi?id=178090
+        http://trac.webkit.org/changeset/223130
+
 2017-10-10  Sam Weinig  <sam@webkit.org>
 

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

@@ -76 +76 @@
 {
     ASSERT(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));
+    return reinterpret_cast<uint64_t>(wpe_renderer_backend_egl_target_get_native_window(m_backend));
 }