Battery-API-return-nothing.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Thu, 22 Mar 2018 22:11:57 +0100
  3. Subject: Battery API: return nothing
  4. Include @thestinger's fix for correct charging/unknown values
  5. ---
  6. .../modules/battery/battery_manager.cc | 25 +++----------------
  7. 1 file changed, 4 insertions(+), 21 deletions(-)
  8. diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
  9. --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
  10. +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
  11. @@ -45,45 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
  12. }
  13. bool BatteryManager::charging() {
  14. - return battery_status_.Charging();
  15. + return true;
  16. }
  17. double BatteryManager::chargingTime() {
  18. - return battery_status_.charging_time();
  19. + return 0.0;
  20. }
  21. double BatteryManager::dischargingTime() {
  22. - return battery_status_.discharging_time();
  23. + return std::numeric_limits<double>::infinity();
  24. }
  25. double BatteryManager::level() {
  26. - return battery_status_.Level();
  27. + return 1.0;
  28. }
  29. void BatteryManager::DidUpdateData() {
  30. DCHECK(battery_property_);
  31. - BatteryStatus old_status = battery_status_;
  32. - battery_status_ = *BatteryDispatcher::Instance().LatestData();
  33. -
  34. if (battery_property_->GetState() == BatteryProperty::kPending) {
  35. battery_property_->Resolve(this);
  36. return;
  37. }
  38. -
  39. - Document* document = Document::From(GetExecutionContext());
  40. - DCHECK(document);
  41. - if (document->IsContextPaused() || document->IsContextDestroyed())
  42. - return;
  43. -
  44. - if (battery_status_.Charging() != old_status.Charging())
  45. - DispatchEvent(*Event::Create(event_type_names::kChargingchange));
  46. - if (battery_status_.charging_time() != old_status.charging_time())
  47. - DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
  48. - if (battery_status_.discharging_time() != old_status.discharging_time())
  49. - DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
  50. - if (battery_status_.Level() != old_status.Level())
  51. - DispatchEvent(*Event::Create(event_type_names::kLevelchange));
  52. }
  53. void BatteryManager::RegisterWithDispatcher() {
  54. --
  55. 2.17.1