<!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>[160437] trunk/Source/WebKit/gtk</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/160437">160437</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-12-11 08:46:18 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][WK1] Add an empty BatteryClientGtk
https://bugs.webkit.org/show_bug.cgi?id=115628
Reviewed by Martin Robinson.
Add an empty BatteryClientGtk, implementing the WebCore's BatteryClient interface.
The implementation is left empty intentionally as the WebKit1 port is now in maintenance
mode and there's no desire to support new features under it. It's still required as the
WebCore implementation of the Battery Status API expects an existing BatteryClient, even
if the latter does not set up a provider that would then serve information about the battery
state.
* GNUmakefile.am: Add the BatteryClientGtk source files to the build.
* WebCoreSupport/BatteryClientGtk.cpp: Added.
(WebKit):
(WebKit::BatteryClientGtk::BatteryClientGtk):
(WebKit::BatteryClientGtk::startUpdating):
(WebKit::BatteryClientGtk::stopUpdating):
(WebKit::BatteryClientGtk::batteryControllerDestroyed):
* WebCoreSupport/BatteryClientGtk.h: Added.
(WebKit):
(BatteryClientGtk):
* webkit/webkitwebview.cpp:
(webkit_web_view_init): Set up the BatteryClientGtk for the new WebCore::Page object.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkGNUmakefileam">trunk/Source/WebKit/gtk/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportBatteryClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportBatteryClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (160436 => 160437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2013-12-11 16:43:08 UTC (rev 160436)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-12-11 16:46:18 UTC (rev 160437)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-12-11 José Dapena Paz <jdapena@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK][WK1] Add an empty BatteryClientGtk
+ https://bugs.webkit.org/show_bug.cgi?id=115628
+
+ Reviewed by Martin Robinson.
+
+ Add an empty BatteryClientGtk, implementing the WebCore's BatteryClient interface.
+ The implementation is left empty intentionally as the WebKit1 port is now in maintenance
+ mode and there's no desire to support new features under it. It's still required as the
+ WebCore implementation of the Battery Status API expects an existing BatteryClient, even
+ if the latter does not set up a provider that would then serve information about the battery
+ state.
+
+ * GNUmakefile.am: Add the BatteryClientGtk source files to the build.
+ * WebCoreSupport/BatteryClientGtk.cpp: Added.
+ (WebKit):
+ (WebKit::BatteryClientGtk::BatteryClientGtk):
+ (WebKit::BatteryClientGtk::startUpdating):
+ (WebKit::BatteryClientGtk::stopUpdating):
+ (WebKit::BatteryClientGtk::batteryControllerDestroyed):
+ * WebCoreSupport/BatteryClientGtk.h: Added.
+ (WebKit):
+ (BatteryClientGtk):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_init): Set up the BatteryClientGtk for the new WebCore::Page object.
+
</ins><span class="cx"> 2013-12-11 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add "enable-mediasource" property to WebKitWebSettings
</span></span></pre></div>
<a id="trunkSourceWebKitgtkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (160436 => 160437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-12-11 16:43:08 UTC (rev 160436)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-12-11 16:46:18 UTC (rev 160437)
</span><span class="lines">@@ -192,6 +192,8 @@
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
</span><ins>+ Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp \
+ Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h \
</ins><span class="cx"> Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportBatteryClientGtkcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp (0 => 160437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp (rev 0)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp 2013-12-11 16:46:18 UTC (rev 160437)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "BatteryClientGtk.h"
+
+#if ENABLE(BATTERY_STATUS)
+
+#include "NotImplemented.h"
+
+namespace WebKit {
+
+BatteryClientGtk::BatteryClientGtk()
+{
+}
+
+void BatteryClientGtk::startUpdating()
+{
+ notImplemented();
+}
+
+void BatteryClientGtk::stopUpdating()
+{
+ notImplemented();
+}
+
+void BatteryClientGtk::batteryControllerDestroyed()
+{
+ notImplemented();
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(BATTERY_STATUS)
</ins></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportBatteryClientGtkh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h (0 => 160437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h (rev 0)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h 2013-12-11 16:46:18 UTC (rev 160437)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef BatteryClientGtk_h
+#define BatteryClientGtk_h
+
+#if ENABLE(BATTERY_STATUS)
+
+#include "BatteryClient.h"
+
+namespace WebKit {
+
+class BatteryClientGtk : public WebCore::BatteryClient {
+public:
+ BatteryClientGtk();
+
+ // WebCore::BatteryClient
+ virtual void startUpdating();
+ virtual void stopUpdating();
+ virtual void batteryControllerDestroyed();
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(BATTERY_STATUS)
+
+#endif // BatteryClientGtk_h
</ins></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (160436 => 160437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-12-11 16:43:08 UTC (rev 160436)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-12-11 16:46:18 UTC (rev 160437)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "ArchiveResource.h"
</span><span class="cx"> #include "BackForwardList.h"
</span><ins>+#include "BatteryClientGtk.h"
</ins><span class="cx"> #include "CairoUtilities.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClientGtk.h"
</span><span class="lines">@@ -3837,6 +3838,10 @@
</span><span class="cx"> WebCore::provideNavigatorContentUtilsTo(priv->corePage, priv->navigatorContentUtilsClient.get());
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(BATTERY_STATUS)
+ WebCore::provideBatteryTo(priv->corePage, new BatteryClientGtk);
+#endif
+
</ins><span class="cx"> if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) {
</span><span class="cx"> // Set some testing-specific settings
</span><span class="cx"> priv->corePage->settings().setInteractiveFormValidationEnabled(true);
</span></span></pre>
</div>
</div>
</body>
</html>