Revert of Migrates battery_status from content/renderer/ to WebKit/platform/

third_party/WebKit/Source/modules/battery/BatteryManager.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/battery/BatteryManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/Event.h"
 #include "modules/battery/BatteryDispatcher.h"
+#include "modules/battery/BatteryStatus.h"
 
 namespace blink {
 
 BatteryManager* BatteryManager::create(ExecutionContext* context)
 {
     BatteryManager* batteryManager = new BatteryManager(context);
     batteryManager->suspendIfNeeded();
     return batteryManager;
 }
 
 BatteryManager::~BatteryManager()
 {
 #if !ENABLE(OILPAN)
     stopUpdating();
 #endif
 }
 
 BatteryManager::BatteryManager(ExecutionContext* context)
     : ActiveDOMObject(context)
     , PlatformEventController(toDocument(context)->page())
+    , m_batteryStatus(BatteryStatus::create())
 {
 }
 
 ScriptPromise BatteryManager::startRequest(ScriptState* scriptState)
 {
     if (!m_batteryProperty) {
         m_batteryProperty = new BatteryProperty(scriptState->executionContext(), this, BatteryProperty::Ready);
 
         // If the context is in a stopped state already, do not start updating.
         if (!executionContext() || executionContext()->activeDOMObjectsAreStopped()) {
             m_batteryProperty->resolve(this);
         } else {
             m_hasEventListener = true;
             startUpdating();
         }
     }
 
     return m_batteryProperty->promise(scriptState->world());
 }
 
 bool BatteryManager::charging()
 {
-    return m_batteryStatus.charging();
+    return m_batteryStatus->charging();
 }
 
 double BatteryManager::chargingTime()
 {
-    return m_batteryStatus.charging_time();
+    return m_batteryStatus->chargingTime();
 }
 
 double BatteryManager::dischargingTime()
 {
-    return m_batteryStatus.discharging_time();
+    return m_batteryStatus->dischargingTime();
 }
 
 double BatteryManager::level()
 {
-    return m_batteryStatus.level();
+    return m_batteryStatus->level();
 }
 
 void BatteryManager::didUpdateData()
 {
     ASSERT(m_batteryProperty);
 
-    BatteryStatus oldStatus = m_batteryStatus;
-    m_batteryStatus = *BatteryDispatcher::instance().latestData();
+    BatteryStatus* oldStatus = m_batteryStatus;
+    m_batteryStatus = BatteryDispatcher::instance().latestData();
 
     if (m_batteryProperty->state() == ScriptPromisePropertyBase::Pending) {
         m_batteryProperty->resolve(this);
         return;
     }
 
     Document* document = toDocument(executionContext());
     ASSERT(document);
     if (document->activeDOMObjectsAreSuspended() || document->activeDOMObjectsAreStopped())
         return;
 
-    if (m_batteryStatus.charging() != oldStatus.charging())
+    ASSERT(oldStatus);
+
+    if (m_batteryStatus->charging() != oldStatus->charging())
         dispatchEvent(Event::create(EventTypeNames::chargingchange));
-    if (m_batteryStatus.charging_time() != oldStatus.charging_time())
+    if (m_batteryStatus->chargingTime() != oldStatus->chargingTime())
         dispatchEvent(Event::create(EventTypeNames::chargingtimechange));
-    if (m_batteryStatus.discharging_time() != oldStatus.discharging_time())
+    if (m_batteryStatus->dischargingTime() != oldStatus->dischargingTime())
         dispatchEvent(Event::create(EventTypeNames::dischargingtimechange));
-    if (m_batteryStatus.level() != oldStatus.level())
+    if (m_batteryStatus->level() != oldStatus->level())
         dispatchEvent(Event::create(EventTypeNames::levelchange));
 }
 
 void BatteryManager::registerWithDispatcher()
 {
     BatteryDispatcher::instance().addController(this);
 }
 
 void BatteryManager::unregisterWithDispatcher()
 {
@@ skipping 27 matching lines @@
 bool BatteryManager::hasPendingActivity() const
 {
     // Prevent V8 from garbage collecting the wrapper object if there are
     // event listeners attached to it.
     return hasEventListeners();
 }
 
 DEFINE_TRACE(BatteryManager)
 {
     visitor->trace(m_batteryProperty);
+    visitor->trace(m_batteryStatus);
     PlatformEventController::trace(visitor);
     RefCountedGarbageCollectedEventTargetWithInlineData<BatteryManager>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink