<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185198] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185198">185198</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-04 03:55:31 -0700 (Thu, 04 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [Wayland] Build is broken on trunk
https://bugs.webkit.org/show_bug.cgi?id=142879
Reviewed by Carlos Garcia Campos.
Source/WebCore:
No new tests, no behavior changes.
Patch on GLContext.h picked from bug 136831 by
Iago Toral <itoral@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
* platform/graphics/GLContext.h: Include wayland-egl.h before eglplatform.h
to use the Wayland platform when building for Wayland.
* platform/graphics/PlatformDisplay.cpp: Fix the include of GDK
headers for the different targets.
* platform/graphics/wayland/WaylandSurface.cpp: Fix build after <a href="http://trac.webkit.org/projects/webkit/changeset/183731">r183731</a>.
(WebCore::WaylandSurface::~WaylandSurface):
Source/WebKit2:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::makeContextCurrent): When Wayland target
is enabled GLNativeWindowType is not an u_int64 type.
Cast contextID to avoid a build failure.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGLContexth">trunk/Source/WebCore/platform/graphics/GLContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp">trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswaylandWaylandSurfacecpp">trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebCore/ChangeLog        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-03 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] [Wayland] Build is broken on trunk
+ https://bugs.webkit.org/show_bug.cgi?id=142879
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests, no behavior changes.
+
+ Patch on GLContext.h picked from bug 136831 by
+ Iago Toral <itoral@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
+
+ * platform/graphics/GLContext.h: Include wayland-egl.h before eglplatform.h
+ to use the Wayland platform when building for Wayland.
+ * platform/graphics/PlatformDisplay.cpp: Fix the include of GDK
+ headers for the different targets.
+ * platform/graphics/wayland/WaylandSurface.cpp: Fix build after r183731.
+ (WebCore::WaylandSurface::~WaylandSurface):
+
</ins><span class="cx"> 2015-06-04 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Implement ReadableStreamController enqueue
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGLContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GLContext.h (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GLContext.h        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebCore/platform/graphics/GLContext.h        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -27,6 +27,10 @@
</span><span class="cx"> #if USE(EGL) && !PLATFORM(GTK)
</span><span class="cx"> #include "eglplatform.h"
</span><span class="cx"> typedef EGLNativeWindowType GLNativeWindowType;
</span><ins>+#elif PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#include <wayland-egl.h>
+#include <EGL/eglplatform.h>
+typedef EGLNativeWindowType GLNativeWindowType;
</ins><span class="cx"> #else
</span><span class="cx"> typedef uint64_t GLNativeWindowType;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -42,8 +42,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><ins>+#if PLATFORM(X11)
</ins><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#include <gdk/gdkwayland.h>
+#endif
+#endif // PLATFORM(GTK)
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL) && defined(HAVE_ECORE_X)
</span><span class="cx"> #include <Ecore_X.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswaylandWaylandSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "GLContextEGL.h"
</span><span class="cx"> #include "IntSize.h"
</span><del>-#include "WaylandDisplay.h"
</del><ins>+#include "PlatformDisplayWayland.h"
</ins><span class="cx"> #include <EGL/egl.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -54,8 +54,9 @@
</span><span class="cx"> WaylandSurface::~WaylandSurface()
</span><span class="cx"> {
</span><span class="cx"> // The surface couldn't have been created in the first place if WaylandDisplay wasn't properly initialized.
</span><del>- ASSERT(WaylandDisplay::instance());
- eglMakeCurrent(WaylandDisplay::instance()->eglDisplay(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
</del><ins>+ const PlatformDisplayWayland& waylandDisplay = downcast<PlatformDisplayWayland>(PlatformDisplay::sharedDisplay());
+ ASSERT(waylandDisplay.native());
+ eglMakeCurrent(waylandDisplay.native(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
</ins><span class="cx">
</span><span class="cx"> wl_egl_window_destroy(m_nativeWindow);
</span><span class="cx"> wl_surface_destroy(m_wlSurface);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebKit2/ChangeLog        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-03 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] [Wayland] Build is broken on trunk
+ https://bugs.webkit.org/show_bug.cgi?id=142879
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::makeContextCurrent): When Wayland target
+ is enabled GLNativeWindowType is not an u_int64 type.
+ Cast contextID to avoid a build failure.
+
</ins><span class="cx"> 2015-06-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Made WKBackForwardListItemPrivate.h a private header after it was added as internal in r185183.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (185197 => 185198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp        2015-06-04 10:19:43 UTC (rev 185197)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp        2015-06-04 10:55:31 UTC (rev 185198)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if (!m_layerTreeContext.contextID)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_context = GLContext::createContextForWindow(m_layerTreeContext.contextID, GLContext::sharingContext());
</del><ins>+ m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_layerTreeContext.contextID), GLContext::sharingContext());
</ins><span class="cx"> if (!m_context)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>