123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 |
- From: csagan5 <32685696+csagan5@users.noreply.github.com>
- Date: Thu, 22 Mar 2018 22:11:57 +0100
- Subject: Battery API: return nothing
- Include @thestinger's fix for correct charging/unknown values
- ---
- .../modules/battery/battery_manager.cc | 26 +++----------------
- 1 file changed, 4 insertions(+), 22 deletions(-)
- diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
- --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
- +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
- @@ -70,46 +70,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
- }
-
- bool BatteryManager::charging() {
- - return battery_status_.Charging();
- + return true;
- }
-
- double BatteryManager::chargingTime() {
- - return battery_status_.charging_time().InSecondsF();
- + return 0.0;
- }
-
- double BatteryManager::dischargingTime() {
- - return battery_status_.discharging_time().InSecondsF();
- + return std::numeric_limits<double>::infinity();
- }
-
- double BatteryManager::level() {
- - return battery_status_.Level();
- + return 1.0;
- }
-
- void BatteryManager::DidUpdateData() {
- DCHECK(battery_property_);
-
- - BatteryStatus old_status = battery_status_;
- - battery_status_ = *battery_dispatcher_->LatestData();
- -
- if (battery_property_->GetState() == BatteryProperty::kPending) {
- battery_property_->Resolve(this);
- return;
- }
- -
- - DCHECK(GetExecutionContext());
- - if (GetExecutionContext()->IsContextPaused() ||
- - GetExecutionContext()->IsContextDestroyed()) {
- - return;
- - }
- -
- - if (battery_status_.Charging() != old_status.Charging())
- - DispatchEvent(*Event::Create(event_type_names::kChargingchange));
- - if (battery_status_.charging_time() != old_status.charging_time())
- - DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
- - if (battery_status_.discharging_time() != old_status.discharging_time())
- - DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
- - if (battery_status_.Level() != old_status.Level())
- - DispatchEvent(*Event::Create(event_type_names::kLevelchange));
- }
-
- void BatteryManager::RegisterWithDispatcher() {
- --
- 2.20.1
|