Title: [223150] trunk/Source/WebKit
- Revision
- 223150
- Author
- commit-qu...@webkit.org
- Date
- 2017-10-10 15:37:41 -0700 (Tue, 10 Oct 2017)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (223149 => 223150)
--- trunk/Source/WebKit/ChangeLog 2017-10-10 22:13:07 UTC (rev 223149)
+++ trunk/Source/WebKit/ChangeLog 2017-10-10 22:37:41 UTC (rev 223150)
@@ -1,3 +1,18 @@
+2017-10-10 Commit Queue <commit-qu...@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 <s...@webkit.org>
Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
Modified: trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp (223149 => 223150)
--- trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2017-10-10 22:13:07 UTC (rev 223149)
+++ trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2017-10-10 22:37:41 UTC (rev 223150)
@@ -75,8 +75,7 @@
uint64_t AcceleratedSurfaceWPE::window() const
{
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));
}
uint64_t AcceleratedSurfaceWPE::surfaceID() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
