<!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>[173068] 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/173068">173068</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-28 12:03:07 -0700 (Thu, 28 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add WaylandEventSource
https://bugs.webkit.org/show_bug.cgi?id=136213
Reviewed by Martin Robinson.
Add the WaylandEventSource class. Its static method, createEventSource(),
creates a new GSource object that is attached to the main context and
enables handling Wayland display events through the GLib's main loop.
The method will be called by the nested Wayland compositor during its
initialization, which will also take the control over the ownership and
will be tasked with properly removing the GSource from the main context.
GLibSource is a GSource-based struct that additionally holds a GPollFD object
and the pointer to the wl_display object whose event loop we'll be
dispatching during the GSource dispatch. This is the type that g_source_new
uses when allocating the new GSource object.
The GSource is assigned the default priorty, can recurse, and is attached
to the main context.
* PlatformGTK.cmake:
* platform/graphics/wayland/WaylandEventSource.cpp: Added.
(WebCore::GLibSource::initialize):
(WebCore::GLibSource::check):
(WebCore::GLibSource::dispatch):
(WebCore::prepareCallback):
(WebCore::checkCallback):
(WebCore::dispatchCallback):
(WebCore::WaylandEventSource::createDisplayEventSource):
* platform/graphics/wayland/WaylandEventSource.h: Added.</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="#trunkSourceWebCoreplatformgraphicswaylandWaylandEventSourcecpp">trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswaylandWaylandEventSourceh">trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173067 => 173068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-28 18:00:33 UTC (rev 173067)
+++ trunk/Source/WebCore/ChangeLog 2014-08-28 19:03:07 UTC (rev 173068)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-08-28 Iago Toral <itoral@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Add WaylandEventSource
+ https://bugs.webkit.org/show_bug.cgi?id=136213
+
+ Reviewed by Martin Robinson.
+
+ Add the WaylandEventSource class. Its static method, createEventSource(),
+ creates a new GSource object that is attached to the main context and
+ enables handling Wayland display events through the GLib's main loop.
+
+ The method will be called by the nested Wayland compositor during its
+ initialization, which will also take the control over the ownership and
+ will be tasked with properly removing the GSource from the main context.
+
+ GLibSource is a GSource-based struct that additionally holds a GPollFD object
+ and the pointer to the wl_display object whose event loop we'll be
+ dispatching during the GSource dispatch. This is the type that g_source_new
+ uses when allocating the new GSource object.
+
+ The GSource is assigned the default priorty, can recurse, and is attached
+ to the main context.
+
+ * PlatformGTK.cmake:
+ * platform/graphics/wayland/WaylandEventSource.cpp: Added.
+ (WebCore::GLibSource::initialize):
+ (WebCore::GLibSource::check):
+ (WebCore::GLibSource::dispatch):
+ (WebCore::prepareCallback):
+ (WebCore::checkCallback):
+ (WebCore::dispatchCallback):
+ (WebCore::WaylandEventSource::createDisplayEventSource):
+ * platform/graphics/wayland/WaylandEventSource.h: Added.
+
</ins><span class="cx"> 2014-08-28 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Safari at com.apple.WebCore: WebCore::AXObjectCache::clearTextMarkerNodesInUse
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (173067 => 173068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-08-28 18:00:33 UTC (rev 173067)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-08-28 19:03:07 UTC (rev 173068)
</span><span class="lines">@@ -431,6 +431,7 @@
</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/WaylandEventSource.cpp
</ins><span class="cx"> platform/graphics/wayland/WaylandSurface.cpp
</span><span class="cx">
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitGtkWaylandClientProtocol.c
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswaylandWaylandEventSourcecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.cpp (0 => 173068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.cpp 2014-08-28 19:03:07 UTC (rev 173068)
</span><span class="lines">@@ -0,0 +1,119 @@
</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 "WaylandEventSource.h"
+
+#if PLATFORM(WAYLAND)
+
+namespace WebCore {
+
+class GLibSource {
+public:
+ void initialize(struct wl_display*);
+
+ gboolean check();
+ gboolean dispatch();
+
+private:
+ GSource m_source;
+ GPollFD m_pollFileDescriptor;
+ struct wl_display* m_display;
+};
+
+void GLibSource::initialize(struct wl_display* display)
+{
+ m_display = display;
+ struct wl_event_loop* loop = wl_display_get_event_loop(display);
+ m_pollFileDescriptor.fd = wl_event_loop_get_fd(loop);
+ m_pollFileDescriptor.events = G_IO_IN | G_IO_ERR | G_IO_HUP;
+ g_source_add_poll(&m_source, &m_pollFileDescriptor);
+
+ g_source_set_name(&m_source, "Nested Wayland compositor display event source");
+ g_source_set_priority(&m_source, G_PRIORITY_DEFAULT);
+ g_source_set_can_recurse(&m_source, TRUE);
+ g_source_attach(&m_source, nullptr);
+}
+
+gboolean GLibSource::check()
+{
+ return m_pollFileDescriptor.revents;
+}
+
+gboolean GLibSource::dispatch()
+{
+ if (m_pollFileDescriptor.revents & G_IO_IN) {
+ struct wl_event_loop* loop = wl_display_get_event_loop(m_display);
+ wl_event_loop_dispatch(loop, -1);
+ wl_display_flush_clients(m_display);
+ m_pollFileDescriptor.revents = 0;
+ }
+
+ if (m_pollFileDescriptor.revents & (G_IO_ERR | G_IO_HUP))
+ g_warning("Wayland Display Event Source: lost connection to nested Wayland compositor");
+
+ return TRUE;
+}
+
+static gboolean prepareCallback(GSource*, gint* timeout)
+{
+ *timeout = -1;
+ return FALSE;
+}
+
+static gboolean checkCallback(GSource* base)
+{
+ auto source = reinterpret_cast<GLibSource*>(base);
+ return source->check();
+}
+
+static gboolean dispatchCallback(GSource* base, GSourceFunc, gpointer)
+{
+ auto source = reinterpret_cast<GLibSource*>(base);
+ return source->dispatch();
+}
+
+static GSourceFuncs waylandGLibSourceFuncs = {
+ prepareCallback,
+ checkCallback,
+ dispatchCallback,
+ nullptr, // finalize
+ nullptr, // closure_callback
+ nullptr, // closure_marshall
+};
+
+GSource* WaylandEventSource::createDisplayEventSource(struct wl_display* display)
+{
+ GSource* base = g_source_new(&waylandGLibSourceFuncs, sizeof(GLibSource));
+
+ auto source = reinterpret_cast<GLibSource*>(base);
+ source->initialize(display);
+
+ return base;
+}
+
+} // namespace WebCore
+
+#endif // PLATFORM(WAYLAND)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswaylandWaylandEventSourceh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.h (0 => 173068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/wayland/WaylandEventSource.h 2014-08-28 19:03:07 UTC (rev 173068)
</span><span class="lines">@@ -0,0 +1,45 @@
</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 WaylandEventSource_h
+#define WaylandEventSource_h
+
+#if PLATFORM(WAYLAND)
+
+#include <glib.h>
+#include <wayland-server.h>
+
+namespace WebCore {
+
+class WaylandEventSource {
+public:
+ static GSource* createDisplayEventSource(struct wl_display*);
+};
+
+} // namespace WebCore
+
+#endif // PLATFORM(WAYLAND)
+
+#endif // WaylandEventSource_h
</ins></span></pre>
</div>
</div>
</body>
</html>