Title: [223130] trunk/Source/WebKit
- Revision
- 223130
- Author
- ape...@igalia.com
- Date
- 2017-10-10 05:47:00 -0700 (Tue, 10 Oct 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223129 => 223130)
--- trunk/Source/WebKit/ChangeLog 2017-10-10 12:02:27 UTC (rev 223129)
+++ trunk/Source/WebKit/ChangeLog 2017-10-10 12:47:00 UTC (rev 223130)
@@ -1,5 +1,16 @@
2017-10-10 Adrian Perez de Castro <ape...@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 <ape...@igalia.com>
+
[WPE] GLib API headers WebKitScriptDialog.h and WebKitFileChooserRequest.h are not installed
https://bugs.webkit.org/show_bug.cgi?id=178104
Modified: trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp (223129 => 223130)
--- trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2017-10-10 12:02:27 UTC (rev 223129)
+++ trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2017-10-10 12:47:00 UTC (rev 223130)
@@ -75,7 +75,8 @@
uint64_t AcceleratedSurfaceWPE::window() const
{
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));
}
uint64_t AcceleratedSurfaceWPE::surfaceID() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
