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

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

Issue 212643010: Add Dispatcher class to the Battery Status API module. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed all comments and waiting for dispatchDeviceEvent impl. Created 6 years, 8 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
Index: Source/modules/battery/BatteryManager.cpp
diff --git a/Source/modules/battery/BatteryManager.cpp b/Source/modules/battery/BatteryManager.cpp
index aa473753d2be64beff8fe1e66d389d25c920a1fe..aa677146b864e25cc46d7a103a1e85b316fa86e7 100644
--- a/Source/modules/battery/BatteryManager.cpp
+++ b/Source/modules/battery/BatteryManager.cpp
@@ -7,6 +7,7 @@
#include "RuntimeEnabledFeatures.h"
#include "core/events/Event.h"
+#include "modules/battery/BatteryDispatcher.h"
#include "modules/battery/BatteryStatus.h"
#include <limits>
@@ -14,58 +15,103 @@ namespace WebCore {
PassRefPtrWillBeRawPtr<BatteryManager> BatteryManager::create(ExecutionContext* context)
{
- return adoptRefWillBeRefCountedGarbageCollected(new BatteryManager(context));
+ RefPtrWillBeRawPtr<BatteryManager> batteryManager(adoptRefWillBeRefCountedGarbageCollected(new BatteryManager(context)));
+ batteryManager->suspendIfNeeded();
+ return batteryManager.release();
}
BatteryManager::~BatteryManager()
{
+ stopUpdating();
}
BatteryManager::BatteryManager(ExecutionContext* context)
- : ContextLifecycleObserver(context)
- , m_batteryStatus(nullptr)
+ : ActiveDOMObject(context)
+ , DeviceSensorEventController(*toDocument(context))
{
+ // Need to figure out a way to startUpdating only afters EventListeners are added: didAddEventListener?
timvolodine 2014/04/14 17:51:57 remove this line, we actually need to start updati
+ m_hasEventListener = true;
+ startUpdating();
}
bool BatteryManager::charging()
{
- return m_batteryStatus ? m_batteryStatus->charging() : true;
+ if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestData())
+ return lastData->charging();
+
+ return true;
}
double BatteryManager::chargingTime()
{
- if (!m_batteryStatus)
- return 0;
-
- if (!m_batteryStatus->charging())
- return std::numeric_limits<double>::infinity();
+ if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestData())
+ return lastData->chargingTime();
- // The spec requires that if level == 1.0, chargingTime == 0 but this has to
- // be implement by the backend. Adding this assert will help enforcing it.
- ASSERT(level() != 1.0 && m_batteryStatus->chargingTime() == 0.0);
-
- return m_batteryStatus->chargingTime();
+ return 0;
}
double BatteryManager::dischargingTime()
{
- if (!m_batteryStatus || m_batteryStatus->charging())
- return std::numeric_limits<double>::infinity();
+ if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestData())
+ return lastData->dischargingTime();
- return m_batteryStatus->dischargingTime();
+ return std::numeric_limits<double>::infinity();
}
double BatteryManager::level()
{
- return m_batteryStatus ? m_batteryStatus->level() : 1;
+ if (const BatteryStatus* lastData = BatteryDispatcher::instance().getLatestData())
+ return lastData->level();
+
+ return 1;
}
-void BatteryManager::didChangeBatteryStatus(PassRefPtrWillBeRawPtr<Event> event, PassOwnPtr<BatteryStatus> batteryStatus)
+void BatteryManager::didChangeBatteryStatus(PassRefPtrWillBeRawPtr<Event> event)
{
ASSERT(RuntimeEnabledFeatures::batteryStatusEnabled());
- m_batteryStatus = batteryStatus;
dispatchEvent(event);
}
+void BatteryManager::registerWithDispatcher()
+{
+ BatteryDispatcher::instance().addClient(this);
+}
+
+void BatteryManager::unregisterWithDispatcher()
+{
+ BatteryDispatcher::instance().removeClient(this);
+}
+
+bool BatteryManager::hasLastData()
+{
+ return false;
+}
+
+PassRefPtrWillBeRawPtr<Event> BatteryManager::getLastEvent()
+{
+ // We would fire events directly.
timvolodine 2014/04/14 17:51:57 could you add that this happens through BatteryMan
Srini 2014/04/14 19:53:11 Sure.
+ return nullptr;
+}
+
+bool BatteryManager::isNullEvent(Event*)
+{
+ return false;
+}
+
+void BatteryManager::suspend()
+{
timvolodine 2014/04/14 17:51:57 how does this work with page visibility? should th
Srini 2014/04/14 19:53:11 Yes, we should have it false here and true on resu
+ stopUpdating();
+}
+
+void BatteryManager::resume()
+{
+ startUpdating();
+}
+
+void BatteryManager::stop()
+{
timvolodine 2014/04/14 17:51:57 is it possible to resume() after stop()? do we nee
+ stopUpdating();
+}
+
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698