<!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>[201440] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/201440">201440</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-26 16:53:25 -0700 (Thu, 26 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr in Modules/battery
https://bugs.webkit.org/show_bug.cgi?id=157062
Reviewed by Darin Adler.
Use RefPtr<>& to reduce uses of PassRefPtr in WebKit.
Source/WebCore:
* Modules/battery/BatteryClient.h:
* Modules/battery/BatteryController.cpp:
(WebCore::BatteryController::BatteryController):
(WebCore::BatteryController::~BatteryController):
(WebCore::BatteryController::addListener):
(WebCore::BatteryController::removeListener):
(WebCore::BatteryController::updateBatteryStatus):
(WebCore::BatteryController::didChangeBatteryStatus):
(WebCore::provideBatteryTo):
* Modules/battery/BatteryController.h:
* Modules/battery/BatteryManager.cpp:
(WebCore::BatteryManager::didChangeBatteryStatus):
(WebCore::BatteryManager::updateBatteryStatus):
* Modules/battery/BatteryManager.h:
* Modules/battery/BatteryStatus.h:
* testing/Internals.cpp:
(WebCore::Internals::setBatteryStatus):
Source/WebKit2:
* WebProcess/Battery/WebBatteryManager.cpp:
(WebKit::WebBatteryManager::didChangeBatteryStatus):
(WebKit::WebBatteryManager::updateBatteryStatus):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_shouldDispatchFakeMouseMoveEvents):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryClienth">trunk/Source/WebCore/Modules/battery/BatteryClient.h</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryControllercpp">trunk/Source/WebCore/Modules/battery/BatteryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryControllerh">trunk/Source/WebCore/Modules/battery/BatteryController.h</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryManagercpp">trunk/Source/WebCore/Modules/battery/BatteryManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryManagerh">trunk/Source/WebCore/Modules/battery/BatteryManager.h</a></li>
<li><a href="#trunkSourceWebCoreModulesbatteryBatteryStatush">trunk/Source/WebCore/Modules/battery/BatteryStatus.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessBatteryWebBatteryManagercpp">trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/ChangeLog 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-05-26 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in Modules/battery
+ https://bugs.webkit.org/show_bug.cgi?id=157062
+
+ Reviewed by Darin Adler.
+
+ Use RefPtr<>& to reduce uses of PassRefPtr in WebKit.
+
+ * Modules/battery/BatteryClient.h:
+ * Modules/battery/BatteryController.cpp:
+ (WebCore::BatteryController::BatteryController):
+ (WebCore::BatteryController::~BatteryController):
+ (WebCore::BatteryController::addListener):
+ (WebCore::BatteryController::removeListener):
+ (WebCore::BatteryController::updateBatteryStatus):
+ (WebCore::BatteryController::didChangeBatteryStatus):
+ (WebCore::provideBatteryTo):
+ * Modules/battery/BatteryController.h:
+ * Modules/battery/BatteryManager.cpp:
+ (WebCore::BatteryManager::didChangeBatteryStatus):
+ (WebCore::BatteryManager::updateBatteryStatus):
+ * Modules/battery/BatteryManager.h:
+ * Modules/battery/BatteryStatus.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::setBatteryStatus):
+
</ins><span class="cx"> 2016-05-25 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WebKitAdditions extension point in HTMLMediaElement.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryClient.h (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryClient.h 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryClient.h 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> virtual void batteryControllerDestroyed() = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void provideBatteryTo(Page*, BatteryClient*);
</del><ins>+void provideBatteryTo(Page&, BatteryClient&);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryController.cpp (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryController.cpp 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryController.cpp 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -29,26 +29,25 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-BatteryController::BatteryController(BatteryClient* client)
</del><ins>+BatteryController::BatteryController(BatteryClient& client)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> {
</span><del>- ASSERT(m_client);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BatteryController::~BatteryController()
</span><span class="cx"> {
</span><span class="cx"> for (auto& listener : m_listeners)
</span><span class="cx"> listener->batteryControllerDestroyed();
</span><del>- m_client->batteryControllerDestroyed();
</del><ins>+ m_client.batteryControllerDestroyed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BatteryController::addListener(BatteryManager* batteryManager)
</span><span class="cx"> {
</span><span class="cx"> m_listeners.append(batteryManager);
</span><del>- m_client->startUpdating();
</del><ins>+ m_client.startUpdating();
</ins><span class="cx">
</span><span class="cx"> if (m_batteryStatus)
</span><del>- batteryManager->updateBatteryStatus(m_batteryStatus);
</del><ins>+ batteryManager->updateBatteryStatus(WTFMove(m_batteryStatus));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BatteryController::removeListener(BatteryManager* batteryManager)
</span><span class="lines">@@ -58,36 +57,34 @@
</span><span class="cx"> return;
</span><span class="cx"> m_listeners.remove(pos);
</span><span class="cx"> if (m_listeners.isEmpty())
</span><del>- m_client->stopUpdating();
</del><ins>+ m_client.stopUpdating();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void BatteryController::updateBatteryStatus(PassRefPtr<BatteryStatus> batteryStatus)
</del><ins>+void BatteryController::updateBatteryStatus(RefPtr<BatteryStatus>&& batteryStatus)
</ins><span class="cx"> {
</span><del>- RefPtr<BatteryStatus> status = batteryStatus;
</del><span class="cx"> if (m_batteryStatus) {
</span><del>- if (m_batteryStatus->charging() != status->charging())
- didChangeBatteryStatus(WebCore::eventNames().chargingchangeEvent, status);
- else if (status->charging() && m_batteryStatus->chargingTime() != status->chargingTime())
- didChangeBatteryStatus(WebCore::eventNames().chargingtimechangeEvent, status);
- else if (!status->charging() && m_batteryStatus->dischargingTime() != status->dischargingTime())
- didChangeBatteryStatus(WebCore::eventNames().dischargingtimechangeEvent, status);
</del><ins>+ if (m_batteryStatus->charging() != batteryStatus->charging())
+ didChangeBatteryStatus(WebCore::eventNames().chargingchangeEvent, batteryStatus.get());
+ else if (batteryStatus->charging() && m_batteryStatus->chargingTime() != batteryStatus->chargingTime())
+ didChangeBatteryStatus(WebCore::eventNames().chargingtimechangeEvent, batteryStatus.get());
+ else if (!batteryStatus->charging() && m_batteryStatus->dischargingTime() != batteryStatus->dischargingTime())
+ didChangeBatteryStatus(WebCore::eventNames().dischargingtimechangeEvent, batteryStatus.get());
</ins><span class="cx">
</span><del>- if (m_batteryStatus->level() != status->level())
- didChangeBatteryStatus(WebCore::eventNames().levelchangeEvent, status);
</del><ins>+ if (m_batteryStatus->level() != batteryStatus->level())
+ didChangeBatteryStatus(WebCore::eventNames().levelchangeEvent, batteryStatus.get());
</ins><span class="cx"> } else {
</span><span class="cx"> for (auto& listener : m_listeners)
</span><del>- listener->updateBatteryStatus(status);
</del><ins>+ listener->updateBatteryStatus(batteryStatus.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_batteryStatus = status.release();
</del><ins>+ m_batteryStatus = WTFMove(batteryStatus);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void BatteryController::didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus> batteryStatus)
</del><ins>+void BatteryController::didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&& batteryStatus)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Event> event = Event::create(eventType, false, false);
</span><del>- RefPtr<BatteryStatus> battery = batteryStatus;
</del><span class="cx"> for (auto& listener : m_listeners)
</span><del>- listener->didChangeBatteryStatus(event, battery);
</del><ins>+ listener->didChangeBatteryStatus(event, batteryStatus.copyRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* BatteryController::supplementName()
</span><span class="lines">@@ -95,9 +92,9 @@
</span><span class="cx"> return "BatteryController";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void provideBatteryTo(Page* page, BatteryClient* client)
</del><ins>+void provideBatteryTo(Page& page, BatteryClient& client)
</ins><span class="cx"> {
</span><del>- Supplement<Page>::provideTo(page, BatteryController::supplementName(), std::make_unique<BatteryController>(client));
</del><ins>+ Supplement<Page>::provideTo(&page, BatteryController::supplementName(), std::make_unique<BatteryController>(client));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryController.h (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryController.h 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryController.h 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx">
</span><span class="cx"> class BatteryController : public Supplement<Page> {
</span><span class="cx"> public:
</span><del>- explicit BatteryController(BatteryClient*);
</del><ins>+ explicit BatteryController(BatteryClient&);
</ins><span class="cx"> ~BatteryController();
</span><span class="cx">
</span><span class="cx"> void addListener(BatteryManager*);
</span><span class="cx"> void removeListener(BatteryManager*);
</span><del>- void updateBatteryStatus(PassRefPtr<BatteryStatus>);
- void didChangeBatteryStatus(const AtomicString& eventType, PassRefPtr<BatteryStatus>);
</del><ins>+ void updateBatteryStatus(RefPtr<BatteryStatus>&&);
+ void didChangeBatteryStatus(const AtomicString& eventType, RefPtr<BatteryStatus>&&);
</ins><span class="cx">
</span><span class="cx"> static const char* supplementName();
</span><span class="cx"> static BatteryController* from(Page* page) { return static_cast<BatteryController*>(Supplement<Page>::from(page, supplementName())); }
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> private:
</span><span class="cx"> typedef Vector<BatteryManager*> ListenerVector;
</span><span class="cx">
</span><del>- BatteryClient* m_client;
</del><ins>+ BatteryClient& m_client;
</ins><span class="cx"> ListenerVector m_listeners;
</span><span class="cx">
</span><span class="cx"> RefPtr<BatteryStatus> m_batteryStatus;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryManager.cpp (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryManager.cpp 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryManager.cpp 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -77,15 +77,15 @@
</span><span class="cx"> return m_batteryStatus ? m_batteryStatus->level() : 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BatteryManager::didChangeBatteryStatus(Event& event, PassRefPtr<BatteryStatus> batteryStatus)
</del><ins>+void BatteryManager::didChangeBatteryStatus(Event& event, RefPtr<BatteryStatus>&& batteryStatus)
</ins><span class="cx"> {
</span><del>- updateBatteryStatus(batteryStatus);
</del><ins>+ updateBatteryStatus(WTFMove(batteryStatus));
</ins><span class="cx"> dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BatteryManager::updateBatteryStatus(PassRefPtr<BatteryStatus> batteryStatus)
</del><ins>+void BatteryManager::updateBatteryStatus(RefPtr<BatteryStatus>&& batteryStatus)
</ins><span class="cx"> {
</span><del>- m_batteryStatus = batteryStatus;
</del><ins>+ m_batteryStatus = WTFMove(batteryStatus);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BatteryManager::canSuspendForDocumentSuspension() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryManager.h (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryManager.h 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryManager.h 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> double dischargingTime();
</span><span class="cx"> double level();
</span><span class="cx">
</span><del>- void didChangeBatteryStatus(Event&, PassRefPtr<BatteryStatus>);
- void updateBatteryStatus(PassRefPtr<BatteryStatus>);
</del><ins>+ void didChangeBatteryStatus(Event&, RefPtr<BatteryStatus>&&);
+ void updateBatteryStatus(RefPtr<BatteryStatus>&&);
</ins><span class="cx"> void batteryControllerDestroyed() { m_batteryController = nullptr; }
</span><span class="cx">
</span><span class="cx"> using RefCounted<BatteryManager>::ref;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesbatteryBatteryStatush"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/battery/BatteryStatus.h (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/battery/BatteryStatus.h 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebCore/Modules/battery/BatteryStatus.h 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-26 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Purge PassRefPtr in Modules/battery
+ https://bugs.webkit.org/show_bug.cgi?id=157062
+
+ Reviewed by Darin Adler.
+
+ Use RefPtr<>& to reduce uses of PassRefPtr in WebKit.
+
+ * WebProcess/Battery/WebBatteryManager.cpp:
+ (WebKit::WebBatteryManager::didChangeBatteryStatus):
+ (WebKit::WebBatteryManager::updateBatteryStatus):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+
</ins><span class="cx"> 2016-05-26 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessBatteryWebBatteryManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -75,21 +75,21 @@
</span><span class="cx">
</span><span class="cx"> void WebBatteryManager::didChangeBatteryStatus(const WTF::AtomicString& eventType, const WebBatteryStatus::Data& data)
</span><span class="cx"> {
</span><del>- RefPtr<BatteryStatus> status = BatteryStatus::create(data.isCharging, data.chargingTime, data.dischargingTime, data.level);
</del><ins>+ auto status = BatteryStatus::create(data.isCharging, data.chargingTime, data.dischargingTime, data.level);
</ins><span class="cx">
</span><span class="cx"> for (auto* page : m_pageSet) {
</span><span class="cx"> if (page->corePage())
</span><del>- BatteryController::from(page->corePage())->didChangeBatteryStatus(eventType, status.get());
</del><ins>+ BatteryController::from(page->corePage())->didChangeBatteryStatus(eventType, status.ptr());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebBatteryManager::updateBatteryStatus(const WebBatteryStatus::Data& data)
</span><span class="cx"> {
</span><del>- RefPtr<BatteryStatus> status = BatteryStatus::create(data.isCharging, data.chargingTime, data.dischargingTime, data.level);
</del><ins>+ auto status = BatteryStatus::create(data.isCharging, data.chargingTime, data.dischargingTime, data.level);
</ins><span class="cx">
</span><span class="cx"> for (auto* page : m_pageSet) {
</span><span class="cx"> if (page->corePage())
</span><del>- BatteryController::from(page->corePage())->updateBatteryStatus(status.get());
</del><ins>+ BatteryController::from(page->corePage())->updateBatteryStatus(status.copyRef());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (201439 => 201440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-26 23:40:37 UTC (rev 201439)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-26 23:53:25 UTC (rev 201440)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> m_drawingArea->updatePreferences(parameters.store);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><del>- WebCore::provideBatteryTo(m_page.get(), new WebBatteryClient(this));
</del><ins>+ WebCore::provideBatteryTo(*m_page, *new WebBatteryClient(this));
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> WebCore::provideGeolocationTo(m_page.get(), new WebGeolocationClient(this));
</span></span></pre>
</div>
</div>
</body>
</html>