<!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>[208300] trunk</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/208300">208300</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 14:29:43 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Battery Status API from the tree
https://bugs.webkit.org/show_bug.cgi?id=164213
Reviewed by Sam Weinig.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/WebCore:
* CMakeLists.txt:
* DerivedSources.cpp:
* Modules/battery: Removed.
* Modules/battery/BatteryClient.h: Removed.
* Modules/battery/BatteryController.cpp: Removed.
* Modules/battery/BatteryController.h: Removed.
* Modules/battery/BatteryManager.cpp: Removed.
* Modules/battery/BatteryManager.h: Removed.
* Modules/battery/BatteryManager.idl: Removed.
* Modules/battery/BatteryStatus.cpp: Removed.
* Modules/battery/BatteryStatus.h: Removed.
* Modules/battery/NavigatorBattery.cpp: Removed.
* Modules/battery/NavigatorBattery.h: Removed.
* Modules/battery/NavigatorBattery.idl: Removed.
* PlatformEfl.cmake:
* dom/EventTargetFactory.in:
* platform/efl/BatteryProviderEfl.cpp: Removed.
* platform/efl/BatteryProviderEfl.h: Removed.
* platform/efl/BatteryProviderEflClient.h: Removed.
* platform/glib/BatteryProviderUPower.cpp: Removed.
* platform/glib/BatteryProviderUPower.h: Removed.
* platform/glib/BatteryProviderUPowerClient.h: Removed.
* testing/Internals.cpp:
(WebCore::Internals::setBatteryStatus): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit2:
* CMakeLists.txt:
* PlatformEfl.cmake:
* Shared/API/APIObject.h:
* Shared/API/c/WKBase.h:
* Shared/WebBatteryStatus.cpp: Removed.
* Shared/WebBatteryStatus.h: Removed.
* UIProcess/API/C/WKAPICast.h:
* UIProcess/API/C/WKBatteryManager.cpp: Removed.
* UIProcess/API/C/WKBatteryManager.h: Removed.
* UIProcess/API/C/WKBatteryStatus.cpp: Removed.
* UIProcess/API/C/WKBatteryStatus.h: Removed.
* UIProcess/API/C/WKContext.cpp:
(WKContextGetBatteryManager): Deleted.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::EwkContext):
* UIProcess/API/efl/ewk_context_private.h:
* UIProcess/API/efl/ewk_main.cpp:
(WebKit::EwkMain::initialize):
(WebKit::EwkMain::finalize):
(WebKit::EwkMain::shutdownInitializedEFLModules):
* UIProcess/API/gtk/WebKitBatteryProvider.cpp: Removed.
* UIProcess/API/gtk/WebKitBatteryProvider.h: Removed.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextConstructed):
* UIProcess/WebBatteryManagerProxy.cpp: Removed.
* UIProcess/WebBatteryManagerProxy.h: Removed.
* UIProcess/WebBatteryManagerProxy.messages.in: Removed.
* UIProcess/WebBatteryProvider.cpp: Removed.
* UIProcess/WebBatteryProvider.h: Removed.
* UIProcess/WebProcessPool.cpp:
(WebKit::m_hiddenPageThrottlingTimer):
* UIProcess/efl/BatteryProvider.cpp: Removed.
* UIProcess/efl/BatteryProvider.h: Removed.
* WebProcess/Battery: Removed.
* WebProcess/Battery/WebBatteryManager.cpp: Removed.
* WebProcess/Battery/WebBatteryManager.h: Removed.
* WebProcess/Battery/WebBatteryManager.messages.in: Removed.
* WebProcess/WebCoreSupport/WebBatteryClient.cpp: Removed.
* WebProcess/WebCoreSupport/WebBatteryClient.h: Removed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_userInterfaceLayoutDirection):
* WebProcess/WebProcess.cpp:
(WebKit::m_resourceLoadStatisticsStorage):
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:
* Scripts/webkitpy/common/config/watchlist:
LayoutTests:
* batterystatus: Removed.
* batterystatus/add-listener-from-callback-expected.txt: Removed.
* batterystatus/add-listener-from-callback.html: Removed.
* batterystatus/basic-all-types-of-events-expected.txt: Removed.
* batterystatus/basic-all-types-of-events.html: Removed.
* batterystatus/basic-operation-expected.txt: Removed.
* batterystatus/basic-operation.html: Removed.
* batterystatus/event-after-navigation-expected.txt: Removed.
* batterystatus/event-after-navigation.html: Removed.
* batterystatus/multiple-frames-expected.txt: Removed.
* batterystatus/multiple-frames.html: Removed.
* batterystatus/resources: Removed.
* batterystatus/resources/event-after-navigation-new.html: Removed.
* batterystatus/script-tests: Removed.
* batterystatus/script-tests/add-listener-from-callback.js: Removed.
* batterystatus/script-tests/basic-all-types-of-events.js: Removed.
* batterystatus/script-tests/basic-operation.js: Removed.
* batterystatus/script-tests/event-after-navigation.js: Removed.
* batterystatus/script-tests/multiple-frames.js: Removed.
* batterystatus/script-tests/updates.js: Removed.
* batterystatus/script-tests/window-property.js: Removed.
* batterystatus/updates-expected.txt: Removed.
* batterystatus/updates.html: Removed.
* batterystatus/window-property-expected.txt: Removed.
* batterystatus/window-property.html: Removed.
* fast/dom/event-handler-attributes.html:
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomeventhandlerattributeshtml">trunk/LayoutTests/fast/dom/event-handler-attributes.html</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCoredomEventTargetFactoryin">trunk/Source/WebCore/dom/EventTargetFactory.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_context_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_maincpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigwatchlist">trunk/Tools/Scripts/webkitpy/common/config/watchlist</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/batterystatus/</li>
<li>trunk/Source/WebCore/Modules/battery/</li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflcpp">trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflh">trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflClienth">trunk/Source/WebCore/platform/efl/BatteryProviderEflClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformglibBatteryProviderUPowercpp">trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformglibBatteryProviderUPowerh">trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h</a></li>
<li><a href="#trunkSourceWebCoreplatformglibBatteryProviderUPowerClienth">trunk/Source/WebCore/platform/glib/BatteryProviderUPowerClient.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBatteryStatuscpp">trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBatteryStatush">trunk/Source/WebKit2/Shared/WebBatteryStatus.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKBatteryManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKBatteryManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKBatteryStatuscpp">trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKBatteryStatush">trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBatteryProvidercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBatteryProviderh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryManagerProxyh">trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryManagerProxymessagesin">trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryProvidercpp">trunk/Source/WebKit2/UIProcess/WebBatteryProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBatteryProviderh">trunk/Source/WebKit2/UIProcess/WebBatteryProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflBatteryProvidercpp">trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflBatteryProviderh">trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h</a></li>
<li>trunk/Source/WebKit2/WebProcess/Battery/</li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
</ins><span class="cx"> 2016-11-02 Olivier Blin <olivier.blin@softathome.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use libgcrypt instead of GnuTLS for CryptoDigest and SubtleCrypto HMAC implementation
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * batterystatus: Removed.
+ * batterystatus/add-listener-from-callback-expected.txt: Removed.
+ * batterystatus/add-listener-from-callback.html: Removed.
+ * batterystatus/basic-all-types-of-events-expected.txt: Removed.
+ * batterystatus/basic-all-types-of-events.html: Removed.
+ * batterystatus/basic-operation-expected.txt: Removed.
+ * batterystatus/basic-operation.html: Removed.
+ * batterystatus/event-after-navigation-expected.txt: Removed.
+ * batterystatus/event-after-navigation.html: Removed.
+ * batterystatus/multiple-frames-expected.txt: Removed.
+ * batterystatus/multiple-frames.html: Removed.
+ * batterystatus/resources: Removed.
+ * batterystatus/resources/event-after-navigation-new.html: Removed.
+ * batterystatus/script-tests: Removed.
+ * batterystatus/script-tests/add-listener-from-callback.js: Removed.
+ * batterystatus/script-tests/basic-all-types-of-events.js: Removed.
+ * batterystatus/script-tests/basic-operation.js: Removed.
+ * batterystatus/script-tests/event-after-navigation.js: Removed.
+ * batterystatus/script-tests/multiple-frames.js: Removed.
+ * batterystatus/script-tests/updates.js: Removed.
+ * batterystatus/script-tests/window-property.js: Removed.
+ * batterystatus/updates-expected.txt: Removed.
+ * batterystatus/updates.html: Removed.
+ * batterystatus/window-property-expected.txt: Removed.
+ * batterystatus/window-property.html: Removed.
+ * fast/dom/event-handler-attributes.html:
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2016-11-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r203289):Assertion in MathOperator::stretchTo() on Wikipedia Page
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomeventhandlerattributeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/event-handler-attributes.html (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/event-handler-attributes.html 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/fast/dom/event-handler-attributes.html 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -339,11 +339,6 @@
</span><span class="cx"> It would be good to extend this test to cover more objects.
</span><span class="cx"> See list below of IDL files that indicate objects have these attributes as of the writing of this test.
</span><span class="cx">
</span><del>-Modules/battery/BatteryManager.idl: attribute EventListener onchargingchange;
-Modules/battery/BatteryManager.idl: attribute EventListener onchargingtimechange;
-Modules/battery/BatteryManager.idl: attribute EventListener ondischargingtimechange;
-Modules/battery/BatteryManager.idl: attribute EventListener onlevelchange;
-
</del><span class="cx"> Modules/encryptedmedia/MediaKeySession.idl: attribute EventListener onwebkitkeyadded;
</span><span class="cx"> Modules/encryptedmedia/MediaKeySession.idl: attribute EventListener onwebkitkeyerror;
</span><span class="cx"> Modules/encryptedmedia/MediaKeySession.idl: attribute EventListener onwebkitkeymessage;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1551,9 +1551,6 @@
</span><span class="cx"> # Issue related to hit testing
</span><span class="cx"> webkit.org/b/86971 svg/hittest/svg-shapes-non-scale-stroke.html [ Failure ]
</span><span class="cx">
</span><del>-# Issue related to battery status and vibration API
-webkit.org/b/85594 fast/dom/navigator-detached-no-crash.html [ Failure ]
-
</del><span class="cx"> # Interferes with the rAF tests that are enabled
</span><span class="cx"> webkit.org/b/85689 fast/animation/request-animation-frame-disabled.html [ Skip ]
</span><span class="cx">
</span><span class="lines">@@ -1969,7 +1966,6 @@
</span><span class="cx"> webkit.org/b/128667 fast/regions/repaint/hover-border-radius.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # Failing after r163562
</span><del>-webkit.org/b/128670 batterystatus/window-property.html [ Failure ]
</del><span class="cx"> webkit.org/b/128670 js/dom/dom-static-property-for-in-iteration.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # HIDPI-related tests do not work
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -282,10 +282,6 @@
</span><span class="cx"> webkit.org/b/99036 http/tests/fullscreen [ Skip ]
</span><span class="cx"> webkit.org/b/99036 http/tests/pointer-lock [ Skip ]
</span><span class="cx">
</span><del>-# Battery Status API support not yet.
-webkit.org/b/95582 batterystatus [ Failure ]
-webkit.org/b/95582 batterystatus/event-after-navigation.html [ Timeout ]
-
</del><span class="cx"> # IETC flexbox failures
</span><span class="cx"> webkit.org/b/85211 ietestcenter/css3/flexbox/flexbox-align-stretch-001.htm [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/85212 ietestcenter/css3/flexbox/flexbox-layout-002.htm [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> fast/events/continuous-platform-wheelevent-in-scrolling-div.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # Not supported on iOS
</span><del>-batterystatus
</del><span class="cx"> fast/mediastream
</span><span class="cx"> fast/speechsynthesis
</span><span class="cx"> gamepad
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -294,9 +294,6 @@
</span><span class="cx"> # <rdar://problem/11059777>
</span><span class="cx"> webkit.org/b/81289 canvas/philip/tests/2d.line.cap.round.html [ Failure ]
</span><span class="cx">
</span><del>-# BatteryClient is not supported
-webkit.org/b/62698 batterystatus/
-
</del><span class="cx"> # Proximity Events are not supported.
</span><span class="cx"> proximity
</span><span class="cx"> fast/events/constructors/device-proximity-event-constructor.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -529,9 +529,6 @@
</span><span class="cx"> # TODO Vibration API is not implemented.
</span><span class="cx"> vibration/ [ Skip ]
</span><span class="cx">
</span><del>-# Needs BatteryClient implementation.
-webkit.org/b/62698 batterystatus/ [ Skip ]
-
</del><span class="cx"> # Proximity Events is not supported.
</span><span class="cx"> proximity/ [ Skip ]
</span><span class="cx"> fast/events/constructors/device-proximity-event-constructor.html
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WTF/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-11-02 Romain Bellessort <romain.bellessort@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Readable Streams API] Enable creation of ReadableByteStreamController
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -345,10 +345,6 @@
</span><span class="cx"> #define ENABLE_APNG 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_BATTERY_STATUS)
-#define ENABLE_BATTERY_STATUS 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CANVAS_PATH)
</span><span class="cx"> #define ENABLE_CANVAS_PATH 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/airplay"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/applepay"
</span><del>- "${WEBCORE_DIR}/Modules/battery"
</del><span class="cx"> "${WEBCORE_DIR}/Modules/encryptedmedia"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/encryptedmedia/legacy"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/fetch"
</span><span class="lines">@@ -139,7 +138,6 @@
</span><span class="cx"> xml
</span><span class="cx">
</span><span class="cx"> Modules/airplay
</span><del>- Modules/battery
</del><span class="cx"> Modules/encryptedmedia/legacy
</span><span class="cx"> Modules/fetch
</span><span class="cx"> Modules/geolocation
</span><span class="lines">@@ -170,9 +168,6 @@
</span><span class="cx"> set(WebCore_NON_SVG_IDL_FILES
</span><span class="cx"> Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
</span><span class="cx">
</span><del>- Modules/battery/BatteryManager.idl
- Modules/battery/NavigatorBattery.idl
-
</del><span class="cx"> Modules/fetch/DOMWindowFetch.idl
</span><span class="cx"> Modules/fetch/FetchBody.idl
</span><span class="cx"> Modules/fetch/FetchHeaders.idl
</span><span class="lines">@@ -794,11 +789,6 @@
</span><span class="cx"> set(WebCore_SOURCES
</span><span class="cx"> Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
</span><span class="cx">
</span><del>- Modules/battery/BatteryController.cpp
- Modules/battery/BatteryManager.cpp
- Modules/battery/BatteryStatus.cpp
- Modules/battery/NavigatorBattery.cpp
-
</del><span class="cx"> Modules/fetch/DOMWindowFetch.cpp
</span><span class="cx"> Modules/fetch/FetchBody.cpp
</span><span class="cx"> Modules/fetch/FetchBodyConsumer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * Modules/battery: Removed.
+ * Modules/battery/BatteryClient.h: Removed.
+ * Modules/battery/BatteryController.cpp: Removed.
+ * Modules/battery/BatteryController.h: Removed.
+ * Modules/battery/BatteryManager.cpp: Removed.
+ * Modules/battery/BatteryManager.h: Removed.
+ * Modules/battery/BatteryManager.idl: Removed.
+ * Modules/battery/BatteryStatus.cpp: Removed.
+ * Modules/battery/BatteryStatus.h: Removed.
+ * Modules/battery/NavigatorBattery.cpp: Removed.
+ * Modules/battery/NavigatorBattery.h: Removed.
+ * Modules/battery/NavigatorBattery.idl: Removed.
+ * PlatformEfl.cmake:
+ * dom/EventTargetFactory.in:
+ * platform/efl/BatteryProviderEfl.cpp: Removed.
+ * platform/efl/BatteryProviderEfl.h: Removed.
+ * platform/efl/BatteryProviderEflClient.h: Removed.
+ * platform/glib/BatteryProviderUPower.cpp: Removed.
+ * platform/glib/BatteryProviderUPower.h: Removed.
+ * platform/glib/BatteryProviderUPowerClient.h: Removed.
+ * testing/Internals.cpp:
+ (WebCore::Internals::setBatteryStatus): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-11-02 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> NetworkSession: Add NetworkDataTask implementation for blobs
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -351,7 +351,6 @@
</span><span class="cx"> #include "JSMutationRecord.cpp"
</span><span class="cx"> #include "JSNamedNodeMap.cpp"
</span><span class="cx"> #include "JSNavigator.cpp"
</span><del>-#include "JSNavigatorBattery.cpp"
</del><span class="cx"> #include "JSNavigatorContentUtils.cpp"
</span><span class="cx"> #include "JSNavigatorGeolocation.cpp"
</span><span class="cx"> #include "JSNavigatorMediaDevices.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx">
</span><span class="cx"> platform/crypto/gnutls/CryptoDigestGnuTLS.cpp
</span><span class="cx">
</span><del>- platform/efl/BatteryProviderEfl.cpp
</del><span class="cx"> platform/efl/CursorEfl.cpp
</span><span class="cx"> platform/efl/DragDataEfl.cpp
</span><span class="cx"> platform/efl/DragImageEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetFactoryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTargetFactory.in (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTargetFactory.in 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/dom/EventTargetFactory.in 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -4,7 +4,6 @@
</span><span class="cx"> AudioNode conditional=WEB_AUDIO
</span><span class="cx"> AudioContext conditional=WEB_AUDIO
</span><span class="cx"> AudioTrackList conditional=VIDEO_TRACK
</span><del>-BatteryManager conditional=BATTERY_STATUS
</del><span class="cx"> DedicatedWorkerGlobalScope
</span><span class="cx"> DOMApplicationCache
</span><span class="cx"> DOMWindow
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,236 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * 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 "BatteryProviderEfl.h"
-
-#if ENABLE(BATTERY_STATUS)
-#include "BatteryProviderEflClient.h"
-#include "EventNames.h"
-#include <limits>
-
-namespace WebCore {
-
-const char BUS[] = "org.freedesktop.UPower";
-
-BatteryProviderEfl::BatteryProviderEfl(BatteryProviderEflClient* client)
- : m_client(client)
- , m_connection(nullptr)
- , m_object(nullptr)
- , m_proxy(nullptr)
- , m_signalHandler(nullptr)
-{
-}
-
-BatteryProviderEfl::~BatteryProviderEfl()
-{
-}
-
-BatteryStatus* BatteryProviderEfl::batteryStatus() const
-{
- return m_batteryStatus.get();
-}
-
-void BatteryProviderEfl::stopUpdating()
-{
- if (m_signalHandler) {
- eldbus_signal_handler_del(m_signalHandler);
- m_signalHandler = nullptr;
- }
-
- if (m_proxy) {
- eldbus_proxy_unref(m_proxy);
- m_proxy = nullptr;
- }
- if (m_object) {
- eldbus_object_unref(m_object);
- m_object = nullptr;
- }
-
- if (m_connection) {
- eldbus_connection_unref(m_connection);
- m_connection = nullptr;
- }
-}
-
-static void batteryProperties(void* data, const Eldbus_Message* message, Eldbus_Pending*)
-{
- if (eldbus_message_error_get(message, nullptr, nullptr))
- return;
-
- Eldbus_Message_Iter* array;
- if (!eldbus_message_arguments_get(message, "a{sv}", &array))
- return;
-
- BatteryProviderEfl* client = static_cast<BatteryProviderEfl*>(data);
- BatteryStatus* clientBatteryStatus = client->batteryStatus();
- bool charging = false;
- bool chargingChanged = false;
-
- bool chargingTimeChanged = false;
- int64_t chargingTime;
-
- bool dischargingTimeChanged = false;
- int64_t dischargingTime;
-
- bool levelChanged = false;
- double level;
-
- Eldbus_Message_Iter* dict;
- while (eldbus_message_iter_get_and_next(array, 'e', &dict)) {
- char* key;
- Eldbus_Message_Iter* variant;
- if (!eldbus_message_iter_arguments_get(dict, "sv", &key, &variant))
- continue;
-
- if (!strcmp(key, "State")) {
- unsigned state;
- eldbus_message_iter_arguments_get(variant, "u", &state);
- if (state == 1) // Charging
- charging = true;
- if (!clientBatteryStatus || charging != clientBatteryStatus->charging())
- chargingChanged = true;
-
- } else if (!strcmp(key, "TimeToEmpty")) {
- eldbus_message_iter_arguments_get(variant, "x", &dischargingTime);
- if (!clientBatteryStatus || dischargingTime != clientBatteryStatus->dischargingTime())
- dischargingTimeChanged = true;
-
- } else if (!strcmp(key, "TimeToFull")) {
- eldbus_message_iter_arguments_get(variant, "x", &chargingTime);
- if (!clientBatteryStatus || chargingTime != clientBatteryStatus->chargingTime())
- chargingTimeChanged = true;
-
- } else if (!strcmp(key, "Percentage")) {
- eldbus_message_iter_arguments_get(variant, "d", &level);
- if (!clientBatteryStatus || level != clientBatteryStatus->level() * 100)
- levelChanged = true;
- }
- }
-
- auto batteryStatus = BatteryStatus::create(charging, chargingTime, dischargingTime, level / 100);
- client->setBatteryStatus(WTFMove(batteryStatus));
- if (chargingChanged)
- client->dispatchEvent(eventNames().chargingchangeEvent);
- if (chargingTimeChanged)
- client->dispatchEvent(eventNames().chargingtimechangeEvent);
- if (dischargingTimeChanged)
- client->dispatchEvent(eventNames().dischargingtimechangeEvent);
- if (levelChanged)
- client->dispatchEvent(eventNames().levelchangeEvent);
-}
-
-static void batteryPropertiesChanged(void* data, const Eldbus_Message*)
-{
- Eldbus_Proxy* proxy = static_cast<Eldbus_Proxy*>(data);
- BatteryProviderEfl* provider = static_cast<BatteryProviderEfl*>(eldbus_proxy_data_get(proxy, "_provider"));
- eldbus_proxy_property_get_all(proxy, batteryProperties, provider);
-}
-
-void BatteryProviderEfl::deviceTypeCallback(void* data, const Eldbus_Message* message, Eldbus_Pending*)
-{
- if (eldbus_message_error_get(message, nullptr, nullptr))
- return;
-
- Eldbus_Message_Iter* variant;
- if (!eldbus_message_arguments_get(message, "v", &variant))
- return;
-
- unsigned type = 0;
- eldbus_message_iter_arguments_get(variant, "u", &type);
- if (type != 2)
- return;
-
- Eldbus_Proxy* proxy = static_cast<Eldbus_Proxy*>(data);
- BatteryProviderEfl* provider = static_cast<BatteryProviderEfl*>(eldbus_proxy_data_get(proxy, "_provider"));
- eldbus_proxy_property_get_all(proxy, batteryProperties, provider);
- provider->setSignalHandler(eldbus_proxy_signal_handler_add(proxy, "Changed", batteryPropertiesChanged, proxy));
-}
-
-void BatteryProviderEfl::enumerateDevices(void* data, const Eldbus_Message* message, Eldbus_Pending*)
-{
- if (eldbus_message_error_get(message, nullptr, nullptr))
- return;
-
- Eldbus_Message_Iter* array;
- if (!eldbus_message_arguments_get(message, "ao", &array))
- return;
-
- char* path;
- while (eldbus_message_iter_get_and_next(array, 'o', &path)) {
- if (!path || !path[0])
- break;
-
- Eldbus_Object* object = eldbus_object_get(static_cast<BatteryProviderEfl*>(data)->connection(), BUS, path);
- if (!object)
- continue;
-
- Eldbus_Proxy* proxy = eldbus_proxy_get(object, "org.freedesktop.UPower.Device");
- if (!proxy)
- continue;
-
- eldbus_proxy_data_set(proxy, "_provider", data);
- eldbus_proxy_property_get(proxy, "Type", deviceTypeCallback, proxy);
- }
-}
-
-void BatteryProviderEfl::startUpdating()
-{
- if (m_connection)
- return;
-
- if (!eldbus_init())
- return;
-
- m_connection = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
- EINA_SAFETY_ON_NULL_RETURN(m_connection);
-
- m_object = eldbus_object_get(m_connection, BUS, "/org/freedesktop/UPower");
- if (!m_object) {
- eldbus_connection_unref(m_connection);
- m_connection = nullptr;
- return;
- }
-
- m_proxy = eldbus_proxy_get(m_object, "org.freedesktop.UPower");
- if (!m_proxy) {
- eldbus_object_unref(m_object);
- m_object = nullptr;
- eldbus_connection_unref(m_connection);
- m_connection = nullptr;
- return;
- }
-
- eldbus_proxy_call(m_proxy, "EnumerateDevices", enumerateDevices, this, -1, "");
-}
-
-void BatteryProviderEfl::setBatteryStatus(Ref<BatteryStatus>&& batteryStatus)
-{
- m_batteryStatus = WTFMove(batteryStatus);
-}
-
-void BatteryProviderEfl::dispatchEvent(const AtomicString& type)
-{
- m_client->didChangeBatteryStatus(type, m_batteryStatus.copyRef());
-}
-
-}
-
-#endif // BATTERY_STATUS
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * 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 BatteryProviderEfl_h
-#define BatteryProviderEfl_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "BatteryClient.h"
-#include "BatteryStatus.h"
-#include <Eldbus.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class BatteryProviderEflClient;
-
-class BatteryProviderEfl {
-public:
- explicit BatteryProviderEfl(BatteryProviderEflClient*);
- ~BatteryProviderEfl();
-
- virtual void startUpdating();
- virtual void stopUpdating();
-
- void setBatteryStatus(Ref<BatteryStatus>&&);
- BatteryStatus* batteryStatus() const;
-
- void dispatchEvent(const AtomicString& type);
-
-private:
- static void enumerateDevices(void* data, const Eldbus_Message*, Eldbus_Pending*);
- static void deviceTypeCallback(void* data, const Eldbus_Message*, Eldbus_Pending*);
-
- Eldbus_Connection* connection() { return m_connection; }
- void setSignalHandler(Eldbus_Signal_Handler* signalHandler) { m_signalHandler = signalHandler; }
-
- BatteryProviderEflClient* m_client;
- RefPtr<BatteryStatus> m_batteryStatus;
-
- Eldbus_Connection* m_connection;
- Eldbus_Object* m_object;
- Eldbus_Proxy* m_proxy;
- Eldbus_Signal_Handler* m_signalHandler;
-};
-
-}
-
-#endif // ENABLE(BATTERY_STATUS)
-#endif // BatteryProviderEfl_h
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/BatteryProviderEflClient.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/BatteryProviderEflClient.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEflClient.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Samsung Electronics. All rights reserved.
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 BatteryProviderEflClient_h
-#define BatteryProviderEflClient_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "BatteryStatus.h"
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class BatteryProviderEflClient {
-public:
- virtual void didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&&) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // BatteryProviderEflClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformglibBatteryProviderUPowercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,137 +0,0 @@
</span><del>-/*
- * 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 "BatteryProviderUPower.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "BatteryProviderUPowerClient.h"
-#include <cmath>
-#include <limits>
-#include <wtf/glib/GUniquePtr.h>
-
-using namespace WebCore;
-
-static void powerDeviceAlterationCallback(UpClient* upowerClient, UpDevice* upowerDevice, BatteryProviderUPower* provider)
-{
- UpDeviceKind deviceKind;
- g_object_get(upowerDevice, "kind", &deviceKind, nullptr);
- if (deviceKind != UP_DEVICE_KIND_BATTERY)
- return;
-
- provider->updateBatteryStatus();
-}
-
-BatteryProviderUPower::BatteryProviderUPower(BatteryProviderUPowerClient* client)
- : m_client(client)
- , m_isUpdating(false)
-{
- ASSERT(m_client);
-}
-
-void BatteryProviderUPower::startUpdating()
-{
- ASSERT(!m_upowerClient);
- m_upowerClient = adoptGRef(up_client_new());
-
- GUniqueOutPtr<GError> error;
- if (!up_client_enumerate_devices_sync(m_upowerClient.get(), 0, &error.outPtr())) {
- m_client->updateBatteryStatus(NotAvailable);
- return;
- }
-
- g_signal_connect(m_upowerClient.get(), "device-changed", G_CALLBACK(powerDeviceAlterationCallback), this);
- g_signal_connect(m_upowerClient.get(), "device-added", G_CALLBACK(powerDeviceAlterationCallback), this);
- g_signal_connect(m_upowerClient.get(), "device-removed", G_CALLBACK(powerDeviceAlterationCallback), this);
-
- m_isUpdating = true;
- updateBatteryStatus();
-}
-
-void BatteryProviderUPower::stopUpdating()
-{
- m_upowerClient.clear();
- m_isUpdating = false;
-}
-
-void BatteryProviderUPower::updateBatteryStatus()
-{
- if (!m_isUpdating)
- return;
-
- GPtrArray* devices = up_client_get_devices(m_upowerClient.get());
- if (!devices) {
- m_client->updateBatteryStatus(NotAvailable);
- return;
- }
-
- unsigned numOfBatteryDevices = 0;
- double combinedEnergyCapacityCurrent = 0, combinedEnergyCapacityFull = 0, combinedEnergyRate = 0;
-
- for (unsigned i = 0; i < devices->len; i++) {
- UpDevice* device = static_cast<UpDevice*>(g_ptr_array_index(devices, i));
- UpDeviceKind deviceKind;
- UpDeviceState deviceState;
- bool isPresent;
- double energyCapacityCurrent = 0, energyCapacityEmpty = 0, energyCapacityFull = 0, energyRate = 0;
-
- g_object_get(device,
- "energy", &energyCapacityCurrent,
- "energy-empty", &energyCapacityEmpty,
- "energy-full", &energyCapacityFull,
- "energy-rate", &energyRate,
- "is-present", &isPresent,
- "kind", &deviceKind,
- "state", &deviceState,
- nullptr);
-
- if (deviceKind != UP_DEVICE_KIND_BATTERY || !isPresent)
- continue;
-
- numOfBatteryDevices++;
- combinedEnergyCapacityCurrent += energyCapacityCurrent - energyCapacityEmpty;
- combinedEnergyCapacityFull += energyCapacityFull;
- // Added energy rate should be signed according to the charging/discharging state.
- combinedEnergyRate += deviceState == UP_DEVICE_STATE_DISCHARGING ? -energyRate : energyRate;
- }
-
- g_ptr_array_unref(devices);
-
- if (!numOfBatteryDevices) {
- m_client->updateBatteryStatus(NotAvailable);
- return;
- }
-
- double level = 0;
- if (combinedEnergyCapacityFull > 0)
- level = combinedEnergyCapacityCurrent / combinedEnergyCapacityFull;
-
- if (combinedEnergyRate >= 0) {
- double chargingTime = std::numeric_limits<double>::infinity();
- if (combinedEnergyRate)
- chargingTime = 3600 * (combinedEnergyCapacityFull - combinedEnergyCapacityCurrent) / combinedEnergyRate;
- m_client->updateBatteryStatus(Charging, chargingTime, level);
- } else {
- double dischargingTime = 3600 * combinedEnergyCapacityCurrent / std::abs(combinedEnergyRate);
- m_client->updateBatteryStatus(Discharging, dischargingTime, level);
- }
-}
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformglibBatteryProviderUPowerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * 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 BatteryProviderUPower_h
-#define BatteryProviderUPower_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include <libupower-glib/upower.h>
-#include <wtf/glib/GRefPtr.h>
-
-namespace WebCore {
-
-class BatteryProviderUPowerClient;
-
-class BatteryProviderUPower {
-public:
- BatteryProviderUPower(BatteryProviderUPowerClient*);
-
- void startUpdating();
- void stopUpdating();
-
- void updateBatteryStatus();
-
-private:
- BatteryProviderUPowerClient* m_client;
-
- GRefPtr<UpClient> m_upowerClient;
-
- bool m_isUpdating;
-};
-
-}
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // BatteryProviderUPower_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformglibBatteryProviderUPowerClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/glib/BatteryProviderUPowerClient.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/BatteryProviderUPowerClient.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/platform/glib/BatteryProviderUPowerClient.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * 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 BatteryProviderUPowerClient_h
-#define BatteryProviderUPowerClient_h
-
-#if ENABLE(BATTERY_STATUS)
-
-namespace WebCore {
-
-enum BatteryProviderUPowerStatus {
- NotAvailable = 0,
- Charging,
- Discharging,
-};
-
-class BatteryProviderUPowerClient {
-public:
- virtual void updateBatteryStatus(BatteryProviderUPowerStatus, double secondsRemaining = 0, double batteryLevel = 0) = 0;
-};
-
-}
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // BatteryProviderUPowerClient_h
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -143,10 +143,6 @@
</span><span class="cx"> #include "ColorChooser.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include "BatteryController.h"
-#endif
-
</del><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span><span class="cx"> #include "DeviceProximityController.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1508,24 +1504,6 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> Internals::setBatteryStatus(const String& eventType, bool charging, double chargingTime, double dischargingTime, double level)
-{
- Document* document = contextDocument();
- if (!document || !document->page())
- return Exception { INVALID_ACCESS_ERR };
-
-#if ENABLE(BATTERY_STATUS)
- BatteryController::from(document->page())->didChangeBatteryStatus(eventType, BatteryStatus::create(charging, chargingTime, dischargingTime, level));
-#else
- UNUSED_PARAM(eventType);
- UNUSED_PARAM(charging);
- UNUSED_PARAM(chargingTime);
- UNUSED_PARAM(dischargingTime);
- UNUSED_PARAM(level);
-#endif
- return { };
-}
-
</del><span class="cx"> ExceptionOr<void> Internals::setDeviceProximity(const String&, double value, double min, double max)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/testing/Internals.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -236,7 +236,6 @@
</span><span class="cx"> InternalSettings* settings() const;
</span><span class="cx"> unsigned workerThreadCount() const;
</span><span class="cx">
</span><del>- ExceptionOr<void> setBatteryStatus(const String& eventType, bool charging, double chargingTime, double dischargingTime, double level);
</del><span class="cx"> ExceptionOr<void> setDeviceProximity(const String& eventType, double value, double min, double max);
</span><span class="cx">
</span><span class="cx"> enum {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -259,10 +259,6 @@
</span><span class="cx"> void beginSimulatedMemoryPressure();
</span><span class="cx"> void endSimulatedMemoryPressure();
</span><span class="cx">
</span><del>-#if defined(ENABLE_BATTERY_STATUS) && ENABLE_BATTERY_STATUS
- [MayThrowException] void setBatteryStatus(DOMString eventType, boolean charging, unrestricted double chargingTime, unrestricted double dischargingTime, unrestricted double level);
-#endif
-
</del><span class="cx"> #if defined(ENABLE_PROXIMITY_EVENTS) && ENABLE_PROXIMITY_EVENTS
</span><span class="cx"> [MayThrowException] void setDeviceProximity(DOMString eventType, unrestricted double value, unrestricted double min, unrestricted double max);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/ApplePay"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/ApplicationCache"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Automation"
</span><del>- "${WEBKIT2_DIR}/WebProcess/Battery"
</del><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Cookies"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Databases"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Databases/IndexedDB"
</span><span class="lines">@@ -76,7 +75,6 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><del>- "${WEBCORE_DIR}/Modules/battery"
</del><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb/client"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb/server"
</span><span class="lines">@@ -263,7 +261,6 @@
</span><span class="cx"> Shared/UserData.cpp
</span><span class="cx"> Shared/VisitedLinkTable.cpp
</span><span class="cx"> Shared/WebBackForwardListItem.cpp
</span><del>- Shared/WebBatteryStatus.cpp
</del><span class="cx"> Shared/WebCompiledContentExtension.cpp
</span><span class="cx"> Shared/WebCompiledContentExtensionData.cpp
</span><span class="cx"> Shared/WebConnection.cpp
</span><span class="lines">@@ -370,8 +367,6 @@
</span><span class="cx"> UIProcess/UserMediaPermissionRequestProxy.cpp
</span><span class="cx"> UIProcess/VisitedLinkStore.cpp
</span><span class="cx"> UIProcess/WebBackForwardList.cpp
</span><del>- UIProcess/WebBatteryManagerProxy.cpp
- UIProcess/WebBatteryProvider.cpp
</del><span class="cx"> UIProcess/WebColorPicker.cpp
</span><span class="cx"> UIProcess/WebConnectionToWebProcess.cpp
</span><span class="cx"> UIProcess/WebContextClient.cpp
</span><span class="lines">@@ -432,8 +427,6 @@
</span><span class="cx"> UIProcess/API/C/WKAuthenticationDecisionListener.cpp
</span><span class="cx"> UIProcess/API/C/WKBackForwardListItemRef.cpp
</span><span class="cx"> UIProcess/API/C/WKBackForwardListRef.cpp
</span><del>- UIProcess/API/C/WKBatteryManager.cpp
- UIProcess/API/C/WKBatteryStatus.cpp
</del><span class="cx"> UIProcess/API/C/WKContext.cpp
</span><span class="cx"> UIProcess/API/C/WKContextConfigurationRef.cpp
</span><span class="cx"> UIProcess/API/C/WKCookieManager.cpp
</span><span class="lines">@@ -527,8 +520,6 @@
</span><span class="cx">
</span><span class="cx"> WebProcess/Automation/WebAutomationSessionProxy.cpp
</span><span class="cx">
</span><del>- WebProcess/Battery/WebBatteryManager.cpp
-
</del><span class="cx"> WebProcess/Cookies/WebCookieManager.cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/Databases/WebDatabaseProvider.cpp
</span><span class="lines">@@ -621,7 +612,6 @@
</span><span class="cx"> WebProcess/UserContent/WebUserContentController.cpp
</span><span class="cx">
</span><span class="cx"> WebProcess/WebCoreSupport/SessionStateConversion.cpp
</span><del>- WebProcess/WebCoreSupport/WebBatteryClient.cpp
</del><span class="cx"> WebProcess/WebCoreSupport/WebChromeClient.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebColorChooser.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebContextMenuClient.cpp
</span><span class="lines">@@ -692,7 +682,6 @@
</span><span class="cx"> UIProcess/DrawingAreaProxy.messages.in
</span><span class="cx"> UIProcess/RemoteWebInspectorProxy.messages.in
</span><span class="cx"> UIProcess/VisitedLinkStore.messages.in
</span><del>- UIProcess/WebBatteryManagerProxy.messages.in
</del><span class="cx"> UIProcess/WebCookieManagerProxy.messages.in
</span><span class="cx"> UIProcess/WebFullScreenManagerProxy.messages.in
</span><span class="cx"> UIProcess/WebGeolocationManagerProxy.messages.in
</span><span class="lines">@@ -725,8 +714,6 @@
</span><span class="cx">
</span><span class="cx"> WebProcess/Automation/WebAutomationSessionProxy.messages.in
</span><span class="cx">
</span><del>- WebProcess/Battery/WebBatteryManager.messages.in
-
</del><span class="cx"> WebProcess/Cookies/WebCookieManager.messages.in
</span><span class="cx">
</span><span class="cx"> WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * Shared/API/APIObject.h:
+ * Shared/API/c/WKBase.h:
+ * Shared/WebBatteryStatus.cpp: Removed.
+ * Shared/WebBatteryStatus.h: Removed.
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKBatteryManager.cpp: Removed.
+ * UIProcess/API/C/WKBatteryManager.h: Removed.
+ * UIProcess/API/C/WKBatteryStatus.cpp: Removed.
+ * UIProcess/API/C/WKBatteryStatus.h: Removed.
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetBatteryManager): Deleted.
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::EwkContext):
+ * UIProcess/API/efl/ewk_context_private.h:
+ * UIProcess/API/efl/ewk_main.cpp:
+ (WebKit::EwkMain::initialize):
+ (WebKit::EwkMain::finalize):
+ (WebKit::EwkMain::shutdownInitializedEFLModules):
+ * UIProcess/API/gtk/WebKitBatteryProvider.cpp: Removed.
+ * UIProcess/API/gtk/WebKitBatteryProvider.h: Removed.
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextConstructed):
+ * UIProcess/WebBatteryManagerProxy.cpp: Removed.
+ * UIProcess/WebBatteryManagerProxy.h: Removed.
+ * UIProcess/WebBatteryManagerProxy.messages.in: Removed.
+ * UIProcess/WebBatteryProvider.cpp: Removed.
+ * UIProcess/WebBatteryProvider.h: Removed.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::m_hiddenPageThrottlingTimer):
+ * UIProcess/efl/BatteryProvider.cpp: Removed.
+ * UIProcess/efl/BatteryProvider.h: Removed.
+ * WebProcess/Battery: Removed.
+ * WebProcess/Battery/WebBatteryManager.cpp: Removed.
+ * WebProcess/Battery/WebBatteryManager.h: Removed.
+ * WebProcess/Battery/WebBatteryManager.messages.in: Removed.
+ * WebProcess/WebCoreSupport/WebBatteryClient.cpp: Removed.
+ * WebProcess/WebCoreSupport/WebBatteryClient.h: Removed.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_userInterfaceLayoutDirection):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::m_resourceLoadStatisticsStorage):
+
</ins><span class="cx"> 2016-11-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkSession: Add NetworkDataTask implementation for blobs
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -143,7 +143,6 @@
</span><span class="cx">
</span><span class="cx"> UIProcess/cairo/BackingStoreCairo.cpp
</span><span class="cx">
</span><del>- UIProcess/efl/BatteryProvider.cpp
</del><span class="cx"> UIProcess/efl/ContextHistoryClientEfl.cpp
</span><span class="cx"> UIProcess/efl/ContextMenuClientEfl.cpp
</span><span class="cx"> UIProcess/efl/DownloadManagerEfl.cpp
</span><span class="lines">@@ -579,12 +578,3 @@
</span><span class="cx"> ${ATK_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><del>-
-if (ENABLE_BATTERY_STATUS)
- list(APPEND WebKit2_LIBRARIES
- ${ELDBUS_LIBRARIES}
- )
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
- ${ELDBUS_INCLUDE_DIRS}
- )
-endif ()
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -101,8 +101,6 @@
</span><span class="cx"> AutomationSession,
</span><span class="cx"> BackForwardList,
</span><span class="cx"> BackForwardListItem,
</span><del>- BatteryManager,
- BatteryStatus,
</del><span class="cx"> CacheManager,
</span><span class="cx"> ColorPickerResultListener,
</span><span class="cx"> ContextMenuListener,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -89,8 +89,6 @@
</span><span class="cx"> typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef;
</span><span class="cx"> typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
</span><span class="cx"> typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef;
</span><del>-typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef;
-typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef;
</del><span class="cx"> typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKColorPickerResultListener* WKColorPickerResultListenerRef;
</span><span class="cx"> typedef const struct OpaqueWKContext* WKContextRef;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBatteryStatuscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WebBatteryStatus.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "ArgumentCoders.h"
-
-namespace WebKit {
-
-WebBatteryStatus::WebBatteryStatus(bool isCharging, double chargingTime, double dischargingTime, double level)
-{
- m_data.isCharging = isCharging;
- m_data.chargingTime = chargingTime;
- m_data.dischargingTime = dischargingTime;
- m_data.level = level;
-}
-
-WebBatteryStatus::~WebBatteryStatus()
-{
-}
-
-void WebBatteryStatus::Data::encode(IPC::Encoder& encoder) const
-{
- encoder << isCharging;
- encoder << chargingTime;
- encoder << dischargingTime;
- encoder << level;
-}
-
-bool WebBatteryStatus::Data::decode(IPC::Decoder& decoder, Data& result)
-{
- if (!decoder.decode(result.isCharging))
- return false;
- if (!decoder.decode(result.chargingTime))
- return false;
- if (!decoder.decode(result.dischargingTime))
- return false;
- if (!decoder.decode(result.level))
- return false;
-
- return true;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBatteryStatush"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebBatteryStatus.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,72 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WebBatteryStatus_h
-#define WebBatteryStatus_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "APIObject.h"
-#include "Decoder.h"
-#include "Encoder.h"
-
-namespace WebKit {
-
-class WebBatteryStatus : public API::ObjectImpl<API::Object::Type::BatteryStatus> {
-public:
- struct Data {
- void encode(IPC::Encoder&) const;
- static bool decode(IPC::Decoder&, Data&);
-
- bool isCharging;
- double chargingTime;
- double dischargingTime;
- double level;
- };
-
- static Ref<WebBatteryStatus> create(bool isCharging, double chargingTime, double dischargingTime, double level)
- {
- return adoptRef(*new WebBatteryStatus(isCharging, chargingTime, dischargingTime, level));
- }
-
- virtual ~WebBatteryStatus();
- double isCharging() const { return m_data.isCharging; }
- double chargingTime() const { return m_data.chargingTime; }
- double dischargingTime() const { return m_data.dischargingTime; }
- double level() const { return m_data.level; }
-
- const Data& data() const { return m_data; }
-
-private:
- WebBatteryStatus(bool isCharging, double chargingTime, double dischargingTime, double level);
-
- Data m_data;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // WebBatteryStatus_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -81,8 +81,6 @@
</span><span class="cx"> class UserMediaPermissionRequestProxy;
</span><span class="cx"> class WebBackForwardList;
</span><span class="cx"> class WebBackForwardListItem;
</span><del>-class WebBatteryManagerProxy;
-class WebBatteryStatus;
</del><span class="cx"> class WebColorPickerResultListenerProxy;
</span><span class="cx"> class WebContextMenuListenerProxy;
</span><span class="cx"> class WebCookieManagerProxy;
</span><span class="lines">@@ -117,8 +115,6 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKAuthenticationDecisionListenerRef, AuthenticationDecisionListener)
</span><span class="cx"> WK_ADD_API_MAPPING(WKBackForwardListItemRef, WebBackForwardListItem)
</span><span class="cx"> WK_ADD_API_MAPPING(WKBackForwardListRef, WebBackForwardList)
</span><del>-WK_ADD_API_MAPPING(WKBatteryManagerRef, WebBatteryManagerProxy)
-WK_ADD_API_MAPPING(WKBatteryStatusRef, WebBatteryStatus)
</del><span class="cx"> WK_ADD_API_MAPPING(WKBundleHitTestResultMediaType, BundleHitTestResultMediaType)
</span><span class="cx"> WK_ADD_API_MAPPING(WKColorPickerResultListenerRef, WebColorPickerResultListenerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKContextRef, WebProcessPool)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKBatteryManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WKBatteryManager.h"
-
-#include "WKAPICast.h"
-#include <wtf/text/AtomicString.h>
-
-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryManagerProxy.h"
-#include "WebBatteryStatus.h"
-#endif
-
-using namespace WebKit;
-
-WKTypeID WKBatteryManagerGetTypeID()
-{
-#if ENABLE(BATTERY_STATUS)
- return toAPI(WebBatteryManagerProxy::APIType);
-#else
- return 0;
-#endif
-}
-
-void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProviderBase* provider)
-{
-#if ENABLE(BATTERY_STATUS)
- toImpl(batteryManager)->initializeProvider(provider);
-#else
- UNUSED_PARAM(batteryManager);
- UNUSED_PARAM(provider);
-#endif
-}
-
-void WKBatteryManagerProviderDidChangeBatteryStatus(WKBatteryManagerRef batteryManager, WKStringRef eventType, WKBatteryStatusRef status)
-{
-#if ENABLE(BATTERY_STATUS)
- toImpl(batteryManager)->providerDidChangeBatteryStatus(AtomicString(toImpl(eventType)->string()), toImpl(status));
-#else
- UNUSED_PARAM(batteryManager);
- UNUSED_PARAM(eventType);
- UNUSED_PARAM(status);
-#endif
-}
-
-void WKBatteryManagerProviderUpdateBatteryStatus(WKBatteryManagerRef batteryManager, WKBatteryStatusRef status)
-{
-#if ENABLE(BATTERY_STATUS)
- toImpl(batteryManager)->providerUpdateBatteryStatus(toImpl(status));
-#else
- UNUSED_PARAM(batteryManager);
- UNUSED_PARAM(status);
-#endif
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKBatteryManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBatteryManager.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WKBatteryManager_h
-#define WKBatteryManager_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Provider.
-typedef void (*WKBatteryProviderStartUpdatingCallback)(WKBatteryManagerRef batteryManager, const void* clientInfo);
-typedef void (*WKBatteryProviderStopUpdatingCallback)(WKBatteryManagerRef batteryManager, const void* clientInfo);
-
-typedef struct WKBatteryProviderBase {
- int version;
- const void * clientInfo;
-} WKBatteryProviderBase;
-
-typedef struct WKBatteryProviderV0 {
- WKBatteryProviderBase base;
-
- WKBatteryProviderStartUpdatingCallback startUpdating;
- WKBatteryProviderStopUpdatingCallback stopUpdating;
-} WKBatteryProviderV0;
-
-WK_EXPORT WKTypeID WKBatteryManagerGetTypeID();
-
-WK_EXPORT void WKBatteryManagerSetProvider(WKBatteryManagerRef batteryManager, const WKBatteryProviderBase* provider);
-
-WK_EXPORT void WKBatteryManagerProviderDidChangeBatteryStatus(WKBatteryManagerRef batteryManager, WKStringRef eventType, WKBatteryStatusRef status);
-WK_EXPORT void WKBatteryManagerProviderUpdateBatteryStatus(WKBatteryManagerRef batteryManager, WKBatteryStatusRef status);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKBatteryManager_h */
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKBatteryStatuscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WKBatteryStatus.h"
-
-#include "WKAPICast.h"
-
-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryStatus.h"
-#endif
-
-using namespace WebKit;
-
-WKTypeID WKBatteryStatusGetTypeID()
-{
-#if ENABLE(BATTERY_STATUS)
- return toAPI(WebBatteryStatus::APIType);
-#else
- return 0;
-#endif
-}
-
-WKBatteryStatusRef WKBatteryStatusCreate(bool isCharging, double chargingTime, double dischargingTime, double level)
-{
-#if ENABLE(BATTERY_STATUS)
- auto status = WebBatteryStatus::create(isCharging, chargingTime, dischargingTime, level);
- return toAPI(&status.leakRef());
-#else
- UNUSED_PARAM(isCharging);
- UNUSED_PARAM(chargingTime);
- UNUSED_PARAM(dischargingTime);
- UNUSED_PARAM(level);
- return 0;
-#endif
-}
-
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKBatteryStatush"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBatteryStatus.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WKBatteryStatus_h
-#define WKBatteryStatus_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKTypeID WKBatteryStatusGetTypeID();
-
-WK_EXPORT WKBatteryStatusRef WKBatteryStatusCreate(bool isCharging, double chargingTime, double dischargingTime, double level);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKBatteryStatus_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -47,9 +47,6 @@
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryManagerProxy.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> template<> struct ClientTraits<WKContextDownloadClientBase> {
</span><span class="lines">@@ -411,16 +408,6 @@
</span><span class="cx"> return reinterpret_cast<WKApplicationCacheManagerRef>(WKContextGetWebsiteDataStore(context));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKBatteryManagerRef WKContextGetBatteryManager(WKContextRef contextRef)
-{
-#if ENABLE(BATTERY_STATUS)
- return toAPI(toImpl(contextRef)->supplement<WebBatteryManagerProxy>());
-#else
- UNUSED_PARAM(contextRef);
- return 0;
-#endif
-}
-
</del><span class="cx"> WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(contextRef)->supplement<WebGeolocationManagerProxy>());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -143,7 +143,6 @@
</span><span class="cx"> WK_EXPORT WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef context);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context);
</span><del>-WK_EXPORT WKBatteryManagerRef WKContextGetBatteryManager(WKContextRef context);
</del><span class="cx"> WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context);
</span><span class="cx"> WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ewk_context.h"
</span><span class="cx">
</span><del>-#include "BatteryProvider.h"
</del><span class="cx"> #include "ContextHistoryClientEfl.h"
</span><span class="cx"> #include "DownloadManagerEfl.h"
</span><span class="cx"> #include "RequestManagerClientEfl.h"
</span><span class="lines">@@ -68,9 +67,6 @@
</span><span class="cx"> : m_context(context)
</span><span class="cx"> , m_databaseManager(std::make_unique<EwkDatabaseManager>())
</span><span class="cx"> , m_storageManager(std::make_unique<EwkStorageManager>(WKContextGetKeyValueStorageManager(context)))
</span><del>-#if ENABLE(BATTERY_STATUS)
- , m_batteryProvider(BatteryProvider::create(context))
-#endif
</del><span class="cx"> , m_downloadManager(std::make_unique<DownloadManagerEfl>(context))
</span><span class="cx"> , m_requestManagerClient(std::make_unique<RequestManagerClientEfl>(context))
</span><span class="cx"> , m_historyClient(std::make_unique<ContextHistoryClientEfl>(context))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_context_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> class ContextHistoryClientEfl;
</span><span class="cx"> class DownloadManagerEfl;
</span><span class="cx"> class RequestManagerClientEfl;
</span><del>-#if ENABLE(BATTERY_STATUS)
-class BatteryProvider;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EwkContext : public EwkObject {
</span><span class="lines">@@ -115,9 +112,6 @@
</span><span class="cx"> std::unique_ptr<EwkDatabaseManager> m_databaseManager;
</span><span class="cx"> std::unique_ptr<EwkFaviconDatabase> m_faviconDatabase;
</span><span class="cx"> std::unique_ptr<EwkStorageManager> m_storageManager;
</span><del>-#if ENABLE(BATTERY_STATUS)
- RefPtr<WebKit::BatteryProvider> m_batteryProvider;
-#endif
</del><span class="cx"> std::unique_ptr<WebKit::DownloadManagerEfl> m_downloadManager;
</span><span class="cx"> std::unique_ptr<WebKit::RequestManagerClientEfl> m_requestManagerClient;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_maincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx"> #include <Ecore_X.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include <Eldbus.h>
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> enum class EFLModuleInitFailure {
</span><span class="lines">@@ -51,9 +47,6 @@
</span><span class="cx"> Efreet,
</span><span class="cx"> EcoreX,
</span><span class="cx"> Edje,
</span><del>-#if ENABLE(BATTERY_STATUS)
- Eldbus
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> EwkMain::EwkMain()
</span><span class="lines">@@ -135,13 +128,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
- if (!eldbus_init()) {
- CRITICAL("Could not init eldbus.");
- shutdownInitializedEFLModules(EFLModuleInitFailure::Eldbus);
- return 0;
- }
-#endif
</del><span class="cx"> if (!ecore_main_loop_glib_integrate()) {
</span><span class="cx"> WARN("Ecore was not compiled with GLib support, some plugins will not "
</span><span class="cx"> "work (ie: Adobe Flash)");
</span><span class="lines">@@ -155,9 +141,6 @@
</span><span class="cx"> if (--m_initCount)
</span><span class="cx"> return m_initCount;
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
- eldbus_shutdown();
-#endif
</del><span class="cx"> edje_shutdown();
</span><span class="cx"> #ifdef HAVE_ECORE_X
</span><span class="cx"> ecore_x_shutdown();
</span><span class="lines">@@ -177,10 +160,6 @@
</span><span class="cx"> void EwkMain::shutdownInitializedEFLModules(EFLModuleInitFailure module)
</span><span class="cx"> {
</span><span class="cx"> switch (module) {
</span><del>-#if ENABLE(BATTERY_STATUS)
- case EFLModuleInitFailure::Eldbus:
- eldbus_shutdown();
-#endif
</del><span class="cx"> case EFLModuleInitFailure::Edje:
</span><span class="cx"> #ifdef HAVE_ECORE_X
</span><span class="cx"> ecore_x_shutdown();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBatteryProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,106 +0,0 @@
</span><del>-/*
- * 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 "WebKitBatteryProvider.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WebBatteryManagerProxy.h"
-#include "WebBatteryStatus.h"
-#include <limits>
-
-using namespace WebKit;
-
-static inline WebKitBatteryProvider* toBatteryProvider(const void* clientInfo)
-{
- return static_cast<WebKitBatteryProvider*>(const_cast<void*>(clientInfo));
-}
-
-static void startUpdatingCallback(WKBatteryManagerRef batteryManager, const void* clientInfo)
-{
- toBatteryProvider(clientInfo)->startUpdating();
-}
-
-static void stopUpdatingCallback(WKBatteryManagerRef batteryManager, const void* clientInfo)
-{
- toBatteryProvider(clientInfo)->stopUpdating();
-}
-
-Ref<WebKitBatteryProvider> WebKitBatteryProvider::create(WebBatteryManagerProxy* batteryManager)
-{
- return adoptRef(*new WebKitBatteryProvider(batteryManager));
-}
-
-WebKitBatteryProvider::WebKitBatteryProvider(WebBatteryManagerProxy* batteryManager)
- : m_batteryManager(batteryManager)
- , m_provider(this)
-{
- ASSERT(batteryManager);
-
- WKBatteryProviderV0 wkBatteryProvider = {
- {
- 0, // version
- this // clientInfo
- },
- startUpdatingCallback,
- stopUpdatingCallback
- };
- WKBatteryManagerSetProvider(toAPI(batteryManager), &wkBatteryProvider.base);
-}
-
-WebKitBatteryProvider::~WebKitBatteryProvider()
-{
- m_provider.stopUpdating();
-}
-
-void WebKitBatteryProvider::startUpdating()
-{
- m_provider.startUpdating();
-}
-
-void WebKitBatteryProvider::stopUpdating()
-{
- m_provider.stopUpdating();
-}
-
-void WebKitBatteryProvider::updateBatteryStatus(WebCore::BatteryProviderUPowerStatus status, double secondsRemaining, double batteryLevel)
-{
- RefPtr<WebBatteryStatus> batteryStatus;
-
- switch (status) {
- case WebCore::NotAvailable:
- // When an implementation cannot report battery status, the default values should be used.
- batteryStatus = WebBatteryStatus::create(true, std::numeric_limits<double>::infinity(),
- std::numeric_limits<double>::infinity(), 1.0);
- break;
- case WebCore::Charging:
- batteryStatus = WebBatteryStatus::create(true, secondsRemaining, 0, batteryLevel);
- break;
- case WebCore::Discharging:
- batteryStatus = WebBatteryStatus::create(false, 0, secondsRemaining, batteryLevel);
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-
- m_batteryManager->providerUpdateBatteryStatus(batteryStatus.get());
-}
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBatteryProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBatteryProvider.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * 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 WebKitBatteryProvider_h
-#define WebKitBatteryProvider_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WebKitPrivate.h"
-#include <WebCore/BatteryProviderUPowerClient.h>
-#include <WebCore/BatteryProviderUPower.h>
-#include <wtf/Ref.h>
-#include <wtf/RefCounted.h>
-
-namespace WebKit {
-
-class WebKitBatteryProvider : public RefCounted<WebKitBatteryProvider>, public WebCore::BatteryProviderUPowerClient {
-public:
- static Ref<WebKitBatteryProvider> create(WebBatteryManagerProxy*);
- virtual ~WebKitBatteryProvider();
-
- void startUpdating();
- void stopUpdating();
-
-private:
- WebKitBatteryProvider(WebBatteryManagerProxy*);
-
- // WebCore::BatteryProviderUPowerClient
- virtual void updateBatteryStatus(WebCore::BatteryProviderUPowerStatus, double secondsRemaining, double batteryLevel);
-
- RefPtr<WebBatteryManagerProxy> m_batteryManager;
- WebCore::BatteryProviderUPower m_provider;
-};
-
-}
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // WebKitBatteryProvider_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -26,11 +26,9 @@
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><del>-#include "WebBatteryManagerProxy.h"
</del><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebGeolocationManagerProxy.h"
</span><del>-#include "WebKitBatteryProvider.h"
</del><span class="cx"> #include "WebKitCookieManagerPrivate.h"
</span><span class="cx"> #include "WebKitDownloadClient.h"
</span><span class="cx"> #include "WebKitDownloadPrivate.h"
</span><span class="lines">@@ -170,9 +168,6 @@
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> RefPtr<WebKitGeolocationProvider> geolocationProvider;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(BATTERY_STATUS)
- RefPtr<WebKitBatteryProvider> batteryProvider;
-#endif
</del><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><span class="cx"> RefPtr<WebKitNotificationProvider> notificationProvider;
</span><span class="cx"> #endif
</span><span class="lines">@@ -292,9 +287,6 @@
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> priv->geolocationProvider = WebKitGeolocationProvider::create(priv->processPool->supplement<WebGeolocationManagerProxy>());
</span><span class="cx"> #endif
</span><del>-#if ENABLE(BATTERY_STATUS)
- priv->batteryProvider = WebKitBatteryProvider::create(priv->processPool->supplement<WebBatteryManagerProxy>());
-#endif
</del><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><span class="cx"> priv->notificationProvider = WebKitNotificationProvider::create(priv->processPool->supplement<WebNotificationManagerProxy>());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryManagerProxycpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,122 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WebBatteryManagerProxy.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WebBatteryManagerMessages.h"
-#include "WebBatteryManagerProxyMessages.h"
-#include "WebProcessPool.h"
-
-namespace WebKit {
-
-const char* WebBatteryManagerProxy::supplementName()
-{
- return "WebBatteryManagerProxy";
-}
-
-Ref<WebBatteryManagerProxy> WebBatteryManagerProxy::create(WebProcessPool* processPool)
-{
- return adoptRef(*new WebBatteryManagerProxy(processPool));
-}
-
-WebBatteryManagerProxy::WebBatteryManagerProxy(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
- , m_isUpdating(false)
-{
- WebContextSupplement::processPool()->addMessageReceiver(Messages::WebBatteryManagerProxy::messageReceiverName(), *this);
-}
-
-WebBatteryManagerProxy::~WebBatteryManagerProxy()
-{
-}
-
-void WebBatteryManagerProxy::initializeProvider(const WKBatteryProviderBase* provider)
-{
- m_provider.initialize(provider);
-}
-
-
-void WebBatteryManagerProxy::providerDidChangeBatteryStatus(const WTF::AtomicString& eventType, WebBatteryStatus* status)
-{
- if (!processPool())
- return;
-
- processPool()->sendToAllProcesses(Messages::WebBatteryManager::DidChangeBatteryStatus(eventType, status->data()));
-}
-
-void WebBatteryManagerProxy::providerUpdateBatteryStatus(WebBatteryStatus* status)
-{
- if (!processPool())
- return;
-
- processPool()->sendToAllProcesses(Messages::WebBatteryManager::UpdateBatteryStatus(status->data()));
-}
-
-// WebContextSupplement
-
-void WebBatteryManagerProxy::processPoolDestroyed()
-{
- stopUpdating();
-}
-
-void WebBatteryManagerProxy::processDidClose(WebProcessProxy*)
-{
- stopUpdating();
-}
-
-void WebBatteryManagerProxy::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebBatteryManagerProxy::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-void WebBatteryManagerProxy::startUpdating()
-{
- if (m_isUpdating)
- return;
-
- m_provider.startUpdating(this);
- m_isUpdating = true;
-}
-
-void WebBatteryManagerProxy::stopUpdating()
-{
- if (!m_isUpdating)
- return;
-
- m_provider.stopUpdating(this);
- m_isUpdating = false;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryManagerProxyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,81 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WebBatteryManagerProxy_h
-#define WebBatteryManagerProxy_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "APIObject.h"
-#include "MessageReceiver.h"
-#include "WebBatteryProvider.h"
-#include "WebContextSupplement.h"
-#include <wtf/Forward.h>
-
-namespace WebKit {
-
-class WebProcessPool;
-class WebBatteryStatus;
-
-class WebBatteryManagerProxy : public API::ObjectImpl<API::Object::Type::BatteryManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static Ref<WebBatteryManagerProxy> create(WebProcessPool*);
- virtual ~WebBatteryManagerProxy();
-
- void initializeProvider(const WKBatteryProviderBase*);
-
- void providerDidChangeBatteryStatus(const WTF::AtomicString&, WebBatteryStatus*);
- void providerUpdateBatteryStatus(WebBatteryStatus*);
-
- using API::Object::ref;
- using API::Object::deref;
-
-private:
- explicit WebBatteryManagerProxy(WebProcessPool*);
-
- // WebContextSupplement
- void processPoolDestroyed() override;
- void processDidClose(WebProcessProxy*) override;
- void refWebContextSupplement() override;
- void derefWebContextSupplement() override;
-
- // IPC::MessageReceiver
- void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-
- void startUpdating();
- void stopUpdating();
-
- bool m_isUpdating;
-
- WebBatteryProvider m_provider;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // WebBatteryManagerProxy_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryManagerProxymessagesin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.messages.in (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.messages.in 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.messages.in 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-#
-# 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
-
-#if ENABLE(BATTERY_STATUS)
-
-messages -> WebBatteryManagerProxy {
- StartUpdating();
- StopUpdating();
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebBatteryProvider.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryProvider.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryProvider.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WebBatteryProvider.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WKAPICast.h"
-#include "WebBatteryManagerProxy.h"
-
-namespace WebKit {
-
-void WebBatteryProvider::startUpdating(WebBatteryManagerProxy* batteryManager)
-{
- if (!m_client.startUpdating)
- return;
-
- m_client.startUpdating(toAPI(batteryManager), m_client.base.clientInfo);
-}
-
-void WebBatteryProvider::stopUpdating(WebBatteryManagerProxy* batteryManager)
-{
- if (!m_client.stopUpdating)
- return;
-
- m_client.stopUpdating(toAPI(batteryManager), m_client.base.clientInfo);
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBatteryProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebBatteryProvider.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBatteryProvider.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryProvider.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WebBatteryProvider_h
-#define WebBatteryProvider_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "APIClient.h"
-#include "WKBatteryManager.h"
-#include <wtf/Forward.h>
-
-namespace API {
-template<> struct ClientTraits<WKBatteryProviderBase> {
- typedef std::tuple<WKBatteryProviderV0> Versions;
-};
-}
-
-namespace WebKit {
-
-class WebBatteryManagerProxy;
-
-class WebBatteryProvider : public API::Client<WKBatteryProviderBase> {
-public:
- void startUpdating(WebBatteryManagerProxy*);
- void stopUpdating(WebBatteryManagerProxy*);
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // WebBatteryProvider_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -77,10 +77,6 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryManagerProxy.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx"> #include "DatabaseProcessMessages.h"
</span><span class="lines">@@ -204,9 +200,6 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> addSupplement<WebSoupCustomProtocolRequestManager>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(BATTERY_STATUS)
- addSupplement<WebBatteryManagerProxy>();
-#endif
</del><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> addSupplement<WebMediaSessionFocusManager>();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflBatteryProvidercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "BatteryProvider.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WKAPICast.h"
-#include "WKBatteryManager.h"
-#include "WKBatteryStatus.h"
-
-using namespace WebCore;
-using namespace WebKit;
-
-static inline BatteryProvider* toBatteryProvider(const void* clientInfo)
-{
- return static_cast<BatteryProvider*>(const_cast<void*>(clientInfo));
-}
-
-static void startUpdatingCallback(WKBatteryManagerRef, const void* clientInfo)
-{
- toBatteryProvider(clientInfo)->startUpdating();
-}
-
-static void stopUpdatingCallback(WKBatteryManagerRef, const void* clientInfo)
-{
- toBatteryProvider(clientInfo)->stopUpdating();
-}
-
-BatteryProvider::~BatteryProvider()
-{
- m_provider.stopUpdating();
-
- WKBatteryManagerSetProvider(m_batteryManager.get(), 0);
-}
-
-Ref<BatteryProvider> BatteryProvider::create(WKContextRef context)
-{
- ASSERT(context);
- return adoptRef(*new BatteryProvider(context));
-}
-
-BatteryProvider::BatteryProvider(WKContextRef context)
- : m_batteryManager(WKContextGetBatteryManager(context))
- , m_provider(this)
-{
- ASSERT(m_batteryManager);
-
- WKBatteryProviderV0 wkBatteryProvider = {
- {
- 0, // version
- this, // clientInfo
- },
- startUpdatingCallback,
- stopUpdatingCallback
- };
-
- WKBatteryManagerSetProvider(m_batteryManager.get(), &wkBatteryProvider.base);
-}
-
-void BatteryProvider::startUpdating()
-{
- m_provider.startUpdating();
-}
-
-void BatteryProvider::stopUpdating()
-{
- m_provider.stopUpdating();
-}
-
-void BatteryProvider::didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&& status)
-{
- WKRetainPtr<WKBatteryStatusRef> wkBatteryStatus = adoptWK(WKBatteryStatusCreate(status->charging(), status->chargingTime(), status->dischargingTime(), status->level()));
-
- WKBatteryManagerProviderDidChangeBatteryStatus(m_batteryManager.get(), toAPI(eventType.impl()), wkBatteryStatus.get());
-}
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflBatteryProviderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/UIProcess/efl/BatteryProvider.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 BatteryProvider_h
-#define BatteryProvider_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "BatteryProviderEfl.h"
-#include "BatteryProviderEflClient.h"
-#include "BatteryStatus.h"
-#include <WebKit/WKBase.h>
-#include <WebKit/WKRetainPtr.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class BatteryProvider : public RefCounted<BatteryProvider>, public WebCore::BatteryProviderEflClient {
-public:
- virtual ~BatteryProvider();
- static Ref<BatteryProvider> create(WKContextRef);
-
- void startUpdating();
- void stopUpdating();
-
-private:
- explicit BatteryProvider(WKContextRef);
-
- // BatteryProviderEflClient interface.
- virtual void didChangeBatteryStatus(const AtomicString& eventType, RefPtr<WebCore::BatteryStatus>&&);
-
- WKRetainPtr<WKBatteryManagerRef> m_batteryManager;
- WebCore::BatteryProviderEfl m_provider;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // BatteryProvider_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WebBatteryClient.h"
-
-#if ENABLE(BATTERY_STATUS)
-
-#include "WebBatteryManager.h"
-#include "WebPage.h"
-#include "WebProcess.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebBatteryClient::startUpdating()
-{
- WebProcess::singleton().supplement<WebBatteryManager>()->registerWebPage(m_page);
-}
-
-void WebBatteryClient::stopUpdating()
-{
- WebProcess::singleton().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
-}
-
-void WebBatteryClient::batteryControllerDestroyed()
-{
- WebProcess::singleton().supplement<WebBatteryManager>()->unregisterWebPage(m_page);
- delete this;
-}
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebBatteryClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebBatteryClient.h 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 WebBatteryClient_h
-#define WebBatteryClient_h
-
-#if ENABLE(BATTERY_STATUS)
-
-#include <WebCore/BatteryClient.h>
-
-namespace WebKit {
-
-class WebPage;
-
-class WebBatteryClient : public WebCore::BatteryClient {
-public:
- WebBatteryClient(WebPage* page)
- : m_page(page)
- {
- }
-
- virtual ~WebBatteryClient() { }
-
-private:
- void startUpdating() override;
- void stopUpdating() override;
- void batteryControllerDestroyed() override;
-
- WebPage* m_page;
-};
-
-} // namespace WebKit
-
-#endif // ENABLE(BATTERY_STATUS)
-
-#endif // WebBatteryClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -196,10 +196,6 @@
</span><span class="cx"> #include <WebCore/MHTMLArchive.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryClient.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIBRATION)
</span><span class="cx"> #include "WebVibrationClient.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -442,9 +438,6 @@
</span><span class="cx"> m_mainFrame = WebFrame::createWithCoreMainFrame(this, &m_page->mainFrame());
</span><span class="cx"> m_drawingArea->updatePreferences(parameters.store);
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
- WebCore::provideBatteryTo(*m_page, *new WebBatteryClient(this));
-#endif
</del><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -129,10 +129,6 @@
</span><span class="cx"> #include "WebNotificationManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(BATTERY_STATUS)
-#include "WebBatteryManager.h"
-#endif
-
</del><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> #include <JavaScriptCore/RemoteInspector.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -195,9 +191,6 @@
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> addSupplement<WebNotificationManager>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(BATTERY_STATUS)
- addSupplement<WebBatteryManager>();
-#endif
</del><span class="cx"> #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</span><span class="cx"> addSupplement<WebMediaKeyStorageManager>();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PUBLIC OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
</span><span class="lines">@@ -199,10 +198,6 @@
</span><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span><span class="cx"> find_package(LibSoup 2.42.0 REQUIRED)
</span><span class="cx">
</span><del>-if (ENABLE_BATTERY_STATUS)
- find_package(Eldbus ${EFL_REQUIRED_VERSION} CONFIG)
-endif ()
-
</del><span class="cx"> if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
</span><span class="cx"> find_package(OpenWebRTC REQUIRED)
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ATTACHMENT_ELEMENT "Toggle attachment element support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" PRIVATE OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" PRIVATE OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CACHE_PARTITIONING "Toggle cache partitioning support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" PRIVATE OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Tools/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-02 Alex Christensen <achristensen@webkit.org>
+
+ Remove Battery Status API from the tree
+ https://bugs.webkit.org/show_bug.cgi?id=164213
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/webkitperl/FeatureList.pm:
+ * Scripts/webkitpy/common/config/watchlist:
+
</ins><span class="cx"> 2016-11-02 Olivier Blin <olivier.blin@softathome.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use libgcrypt instead of GnuTLS for CryptoDigest and SubtleCrypto HMAC implementation
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> $allInOneBuild,
</span><span class="cx"> $asyncfunctionSyntax,
</span><span class="cx"> $attachmentElementSupport,
</span><del>- $batteryStatusSupport,
</del><span class="cx"> $canvasPathSupport,
</span><span class="cx"> $canvasProxySupport,
</span><span class="cx"> $channelMessagingSupport,
</span><span class="lines">@@ -185,9 +184,6 @@
</span><span class="cx"> { option => "attachment-element", desc => "Toggle Attachment Element support",
</span><span class="cx"> define => "ENABLE_ATTACHMENT_ELEMENT", default => 0, value => \$attachmentElementSupport },
</span><span class="cx">
</span><del>- { option => "battery-status", desc => "Toggle Battery Status support",
- define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
-
</del><span class="cx"> { option => "canvas-path", desc => "Toggle Canvas Path support",
</span><span class="cx"> define => "ENABLE_CANVAS_PATH", default => 1, value => \$canvasPathSupport },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigwatchlist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (208299 => 208300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2016-11-02 21:09:35 UTC (rev 208299)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2016-11-02 21:29:43 UTC (rev 208300)
</span><span class="lines">@@ -166,9 +166,6 @@
</span><span class="cx"> "Editing": {
</span><span class="cx"> "filename": r"Source/WebCore/editing/",
</span><span class="cx"> },
</span><del>- "Battery": {
- "filename": r"Source/WebCore/Modules/battery",
- },
</del><span class="cx"> "WTF": {
</span><span class="cx"> "filename": r"Source/WTF/wtf",
</span><span class="cx"> },
</span><span class="lines">@@ -357,7 +354,6 @@
</span><span class="cx"> "Animation" : [ "simon.fraser@apple.com", "dino@apple.com", "dstockwell@chromium.org" ],
</span><span class="cx"> "Animometer" : [ "sabouhallawa@apple.com" ],
</span><span class="cx"> "AppleMacPublicApi": [ "timothy@apple.com" ],
</span><del>- "Battery": [ "gyuyoung.kim@webkit.org" ],
</del><span class="cx"> "BindingsScripts": [ "cdumez@apple.com" ],
</span><span class="cx"> "CMake": [ "rakuco@webkit.org", "gyuyoung.kim@webkit.org", "ryuan.choi@gmail.com", "sergio.correia@openbossa.org", "mcatanzaro@igalia.com" ],
</span><span class="cx"> "CoordinatedGraphics" : [ "noam@webkit.org", "zeno@webkit.org", "cmarcelo@webkit.org", "luiz@webkit.org", "ryuan.choi@gmail.com", "sergio.correia@openbossa.org", "gyuyoung.kim@webkit.org" ],
</span></span></pre>
</div>
</div>
</body>
</html>