<!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>[185642] 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/185642">185642</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-16 23:00:31 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Inhibit screen saver when playing full screen video
https://bugs.webkit.org/show_bug.cgi?id=145795
Reviewed by Gustavo Noronha Silva.
Source/WebCore/platform/gtk/po:
* POTFILES.in: Add WebKitWebViewBase.cpp.
Source/WebKit2:
Use Freedesktop.org DBus API to inhibit/unhinibit the screen saver
when entering/leaving fullscreen.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(screenSaverInhibitedCallback):
(webkitWebViewBaseSendInhibitMessageToScreenSaver):
(screenSaverProxyCreatedCallback):
(webkitWebViewBaseInhibitScreenSaver):
(webkitWebViewBaseUninhibitScreenSaver):
(webkitWebViewBaseEnterFullScreen):
(webkitWebViewBaseExitFullScreen):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkpoChangeLog">trunk/Source/WebCore/platform/gtk/po/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkpoPOTFILESin">trunk/Source/WebCore/platform/gtk/po/POTFILES.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreplatformgtkpoChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/po/ChangeLog (185641 => 185642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/po/ChangeLog 2015-06-17 06:00:27 UTC (rev 185641)
+++ trunk/Source/WebCore/platform/gtk/po/ChangeLog 2015-06-17 06:00:31 UTC (rev 185642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Inhibit screen saver when playing full screen video
+ https://bugs.webkit.org/show_bug.cgi?id=145795
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * POTFILES.in: Add WebKitWebViewBase.cpp.
+
</ins><span class="cx"> 2015-05-22 Jordi Mas <jmas@softcatala.org>
</span><span class="cx">
</span><span class="cx"> [l10n] Add Catalan translation for WebKitGTK+
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkpoPOTFILESin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/po/POTFILES.in (185641 => 185642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2015-06-17 06:00:27 UTC (rev 185641)
+++ trunk/Source/WebCore/platform/gtk/po/POTFILES.in 2015-06-17 06:00:31 UTC (rev 185642)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp
</span><ins>+../../../WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
</ins><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp
</span><span class="cx"> ../../../WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185641 => 185642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-17 06:00:27 UTC (rev 185641)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-17 06:00:31 UTC (rev 185642)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Inhibit screen saver when playing full screen video
+ https://bugs.webkit.org/show_bug.cgi?id=145795
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Use Freedesktop.org DBus API to inhibit/unhinibit the screen saver
+ when entering/leaving fullscreen.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (screenSaverInhibitedCallback):
+ (webkitWebViewBaseSendInhibitMessageToScreenSaver):
+ (screenSaverProxyCreatedCallback):
+ (webkitWebViewBaseInhibitScreenSaver):
+ (webkitWebViewBaseUninhibitScreenSaver):
+ (webkitWebViewBaseEnterFullScreen):
+ (webkitWebViewBaseExitFullScreen):
+
</ins><span class="cx"> 2015-06-16 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr with Ref or RefPtr
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (185641 => 185642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-17 06:00:27 UTC (rev 185641)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-17 06:00:31 UTC (rev 185642)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include <WebCore/Region.h>
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><ins>+#include <glib/gi18n-lib.h>
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="lines">@@ -187,6 +188,9 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> bool fullScreenModeActive;
</span><span class="cx"> WebFullScreenClientGtk fullScreenClient;
</span><ins>+ GRefPtr<GDBusProxy> screenSaverProxy;
+ GRefPtr<GCancellable> screenSaverInhibitCancellable;
+ unsigned screenSaverCookie;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><span class="lines">@@ -1200,6 +1204,71 @@
</span><span class="cx"> webkitWebViewBase->priv->shouldForwardNextKeyEvent = TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(FULLSCREEN_API)
+static void screenSaverInhibitedCallback(GDBusProxy* screenSaverProxy, GAsyncResult* result, WebKitWebViewBase* webViewBase)
+{
+ GRefPtr<GVariant> returnValue = adoptGRef(g_dbus_proxy_call_finish(screenSaverProxy, result, nullptr));
+ if (returnValue)
+ g_variant_get(returnValue.get(), "(u)", &webViewBase->priv->screenSaverCookie);
+ webViewBase->priv->screenSaverInhibitCancellable = nullptr;
+}
+
+static void webkitWebViewBaseSendInhibitMessageToScreenSaver(WebKitWebViewBase* webViewBase)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ ASSERT(priv->screenSaverProxy);
+ priv->screenSaverCookie = 0;
+ if (!priv->screenSaverInhibitCancellable)
+ priv->screenSaverInhibitCancellable = g_cancellable_new();
+ g_dbus_proxy_call(priv->screenSaverProxy.get(), "Inhibit", g_variant_new("(ss)", g_get_prgname(), _("Website running in fullscreen mode")),
+ G_DBUS_CALL_FLAGS_NONE, -1, priv->screenSaverInhibitCancellable.get(), reinterpret_cast<GAsyncReadyCallback>(screenSaverInhibitedCallback), webViewBase);
+}
+
+static void screenSaverProxyCreatedCallback(GObject*, GAsyncResult* result, WebKitWebViewBase* webViewBase)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ priv->screenSaverProxy = adoptGRef(g_dbus_proxy_new_for_bus_finish(result, nullptr));
+ if (!priv->screenSaverProxy)
+ return;
+
+ webkitWebViewBaseSendInhibitMessageToScreenSaver(webViewBase);
+}
+
+static void webkitWebViewBaseInhibitScreenSaver(WebKitWebViewBase* webViewBase)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ if (priv->screenSaverCookie) {
+ // Already inhibited.
+ return;
+ }
+
+ if (priv->screenSaverProxy) {
+ webkitWebViewBaseSendInhibitMessageToScreenSaver(webViewBase);
+ return;
+ }
+
+ priv->screenSaverInhibitCancellable = g_cancellable_new();
+ g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION, static_cast<GDBusProxyFlags>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS),
+ nullptr, "org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", priv->screenSaverInhibitCancellable.get(),
+ reinterpret_cast<GAsyncReadyCallback>(screenSaverProxyCreatedCallback), webViewBase);
+}
+
+static void webkitWebViewBaseUninhibitScreenSaver(WebKitWebViewBase* webViewBase)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ if (!priv->screenSaverCookie) {
+ // Not inhibited or it's being inhibited.
+ g_cancellable_cancel(priv->screenSaverInhibitCancellable.get());
+ return;
+ }
+
+ // If we have a cookie we should have a proxy.
+ ASSERT(priv->screenSaverProxy);
+ g_dbus_proxy_call(priv->screenSaverProxy.get(), "UnInhibit", g_variant_new("(u)", priv->screenSaverCookie), G_DBUS_CALL_FLAGS_NONE, -1, nullptr, nullptr, nullptr);
+ priv->screenSaverCookie = 0;
+}
+#endif
+
</ins><span class="cx"> void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase* webkitWebViewBase)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -1218,6 +1287,7 @@
</span><span class="cx"> gtk_window_fullscreen(GTK_WINDOW(topLevelWindow));
</span><span class="cx"> fullScreenManagerProxy->didEnterFullScreen();
</span><span class="cx"> priv->fullScreenModeActive = true;
</span><ins>+ webkitWebViewBaseInhibitScreenSaver(webkitWebViewBase);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1239,6 +1309,7 @@
</span><span class="cx"> gtk_window_unfullscreen(GTK_WINDOW(topLevelWindow));
</span><span class="cx"> fullScreenManagerProxy->didExitFullScreen();
</span><span class="cx"> priv->fullScreenModeActive = false;
</span><ins>+ webkitWebViewBaseUninhibitScreenSaver(webkitWebViewBase);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>