<!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>[173052] trunk/Source/WebCore</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/173052">173052</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-27 23:09:04 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add WaylandSurface
https://bugs.webkit.org/show_bug.cgi?id=136220
Reviewed by Martin Robinson.
Add the WaylandSurface class. An objects of this type is meant to be used
by the LayerTreeHostGtk in the WebProcess and is constructed via the
WaylandDisplay::createSurface() method.
LayerTreeHostGtk uses such object to perform frame requests to the nested
Wayland compositor in the UIProcess, and to create the GLContextEGL object
that's used during the layer flushing and compositing.
The resize() method is called whenever LayerTreeHostGtk is being resized,
and basically only wraps the wl_egL_window_resize() call.
* PlatformGTK.cmake:
* platform/graphics/wayland/WaylandSurface.cpp: Added.
(WebCore::frameCallback):
(WebCore::WaylandSurface::WaylandSurface):
(WebCore::WaylandSurface::~WaylandSurface):
(WebCore::WaylandSurface::resize):
(WebCore::WaylandSurface::createGLContext):
(WebCore::WaylandSurface::requestFrame):
* platform/graphics/wayland/WaylandSurface.h: Added.
(WebCore::WaylandSurface::surface):
(WebCore::WaylandSurface::nativeWindowHandle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicswaylandWaylandSurfacecpp">trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswaylandWaylandSurfaceh">trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173051 => 173052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-28 05:58:44 UTC (rev 173051)
+++ trunk/Source/WebCore/ChangeLog        2014-08-28 06:09:04 UTC (rev 173052)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-27 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Add WaylandSurface
+ https://bugs.webkit.org/show_bug.cgi?id=136220
+
+ Reviewed by Martin Robinson.
+
+ Add the WaylandSurface class. An objects of this type is meant to be used
+ by the LayerTreeHostGtk in the WebProcess and is constructed via the
+ WaylandDisplay::createSurface() method.
+
+ LayerTreeHostGtk uses such object to perform frame requests to the nested
+ Wayland compositor in the UIProcess, and to create the GLContextEGL object
+ that's used during the layer flushing and compositing.
+
+ The resize() method is called whenever LayerTreeHostGtk is being resized,
+ and basically only wraps the wl_egL_window_resize() call.
+
+ * PlatformGTK.cmake:
+ * platform/graphics/wayland/WaylandSurface.cpp: Added.
+ (WebCore::frameCallback):
+ (WebCore::WaylandSurface::WaylandSurface):
+ (WebCore::WaylandSurface::~WaylandSurface):
+ (WebCore::WaylandSurface::resize):
+ (WebCore::WaylandSurface::createGLContext):
+ (WebCore::WaylandSurface::requestFrame):
+ * platform/graphics/wayland/WaylandSurface.h: Added.
+ (WebCore::WaylandSurface::surface):
+ (WebCore::WaylandSurface::nativeWindowHandle):
+
</ins><span class="cx"> 2014-08-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> URTBF after r173047.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (173051 => 173052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake        2014-08-28 05:58:44 UTC (rev 173051)
+++ trunk/Source/WebCore/PlatformGTK.cmake        2014-08-28 06:09:04 UTC (rev 173052)
</span><span class="lines">@@ -434,6 +434,8 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WAYLAND_TARGET)
</span><span class="cx"> list(APPEND WebCorePlatformGTK_SOURCES
</span><ins>+ platform/graphics/wayland/WaylandSurface.cpp
+
</ins><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswaylandWaylandSurfacecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp (0 => 173052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp         (rev 0)
+++ trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp        2014-08-28 06:09:04 UTC (rev 173052)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WaylandSurface.h"
+
+#if PLATFORM(WAYLAND)
+
+#include "GLContextEGL.h"
+#include "WaylandDisplay.h"
+#include <EGL/egl.h>
+
+namespace WebCore {
+
+void frameCallback(void*, struct wl_callback* callback, uint32_t)
+{
+ if (callback)
+ wl_callback_destroy(callback);
+}
+
+static const struct wl_callback_listener frameListener = {
+ frameCallback
+};
+
+WaylandSurface::WaylandSurface(struct wl_surface* wlSurface, EGLNativeWindowType nativeWindow)
+ : m_wlSurface(wlSurface)
+ , m_nativeWindow(nativeWindow)
+{
+}
+
+WaylandSurface::~WaylandSurface()
+{
+ eglMakeCurrent(WaylandDisplay::instance()->eglDisplay(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+ wl_egl_window_destroy(m_nativeWindow);
+ wl_surface_destroy(m_wlSurface);
+}
+
+void WaylandSurface::resize(const IntSize& size)
+{
+ wl_egl_window_resize(m_nativeWindow, size.width(), size.height(), 0, 0);
+}
+
+PassOwnPtr<GLContextEGL> WaylandSurface::createGLContext()
+{
+ return GLContextEGL::createWindowContext(m_nativeWindow, GLContext::sharingContext());
+}
+
+void WaylandSurface::requestFrame()
+{
+ struct wl_callback* frameCallback = wl_surface_frame(m_wlSurface);
+ wl_callback_add_listener(frameCallback, &frameListener, this);
+}
+
+} // namespace WebCore
+
+#endif // PLATFORM(WAYLAND)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswaylandWaylandSurfaceh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.h (0 => 173052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.h         (rev 0)
+++ trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.h        2014-08-28 06:09:04 UTC (rev 173052)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WaylandSurface_h
+#define WaylandSurface_h
+
+#if PLATFORM(WAYLAND)
+
+#include <wayland-client.h>
+#include <wtf/PassOwnPtr.h>
+
+#include <wayland-egl.h>
+#include <EGL/eglplatform.h>
+
+namespace WebCore {
+
+class GLContextEGL;
+
+class WaylandSurface {
+public:
+ WaylandSurface(struct wl_surface*, EGLNativeWindowType);
+ ~WaylandSurface();
+
+ struct wl_surface* surface() { return m_wlSurface; }
+ EGLNativeWindowType nativeWindowHandle() { return m_nativeWindow; }
+
+ void resize(const IntSize&);
+
+ PassOwnPtr<GLContextEGL> createGLContext();
+
+ void requestFrame();
+
+private:
+ struct wl_surface* m_wlSurface;
+ EGLNativeWindowType m_nativeWindow;
+};
+
+} // namespace WebCore
+
+#endif // PLATFORM(WAYLAND)
+
+#endif // WaylandSurface_h
</ins></span></pre>
</div>
</div>
</body>
</html>