Skip to content

Commit

Permalink
Unreviewed, rolling out r223130.
Browse files Browse the repository at this point in the history
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

Canonical link: https://commits.webkit.org/194393@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223150 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Oct 10, 2017
1 parent 2824311 commit a837606
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
15 changes: 15 additions & 0 deletions Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
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>

Replace copyKeysToVector/copyValuesToVector with copyToVector(map.keys())/copyToVector(map.values())
Expand Down
Expand Up @@ -75,8 +75,7 @@ void AcceleratedSurfaceWPE::finalize()
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
Expand Down

0 comments on commit a837606

Please sign in to comment.