Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2273)

Unified Diff: Source/modules/battery/BatteryManager.cpp

Issue 341053002: Oilpan: move BatteryStatus to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/battery/BatteryStatus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/battery/BatteryManager.cpp
diff --git a/Source/modules/battery/BatteryManager.cpp b/Source/modules/battery/BatteryManager.cpp
index 7e633fa3e6d6c8503fe1b876f5b9705e2fff9fb2..7be6038a26e2b292c02067a2ccb9ba33c8e96dd1 100644
--- a/Source/modules/battery/BatteryManager.cpp
+++ b/Source/modules/battery/BatteryManager.cpp
@@ -76,11 +76,13 @@ void BatteryManager::didUpdateData()
ASSERT(RuntimeEnabledFeatures::batteryStatusEnabled());
ASSERT(m_state != NotStarted);
- RefPtr<BatteryStatus> oldStatus = m_batteryStatus;
+ RefPtrWillBeRawPtr<BatteryStatus> oldStatus = m_batteryStatus;
m_batteryStatus = BatteryDispatcher::instance().latestData();
+#if !ENABLE(OILPAN)
// BatteryDispatcher also holds a reference to m_batteryStatus.
ASSERT(m_batteryStatus->refCount() > 1);
+#endif
if (m_state == Pending) {
ASSERT(m_resolver);
@@ -138,4 +140,10 @@ void BatteryManager::stop()
stopUpdating();
}
+void BatteryManager::trace(Visitor* visitor)
+{
+ visitor->trace(m_batteryStatus);
+ EventTargetWithInlineData::trace(visitor);
+}
+
} // namespace WebCore
« no previous file with comments | « Source/modules/battery/BatteryManager.h ('k') | Source/modules/battery/BatteryStatus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698