diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/third_party/blink/renderer/modules/battery | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/battery')
4 files changed, 7 insertions, 4 deletions
diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.cc b/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.cc index e2075b994f1..7dc24a05041 100644 --- a/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.cc +++ b/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.cc @@ -43,7 +43,7 @@ void BatteryDispatcher::UpdateBatteryStatus( NotifyControllers(); } -void BatteryDispatcher::StartListening() { +void BatteryDispatcher::StartListening(LocalFrame* frame) { DCHECK(!monitor_.is_bound()); Platform::Current()->GetInterfaceProvider()->GetInterface( mojo::MakeRequest(&monitor_)); diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h b/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h index 5c0e20be7ec..78c6592262c 100644 --- a/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h +++ b/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h @@ -34,7 +34,7 @@ class MODULES_EXPORT BatteryDispatcher final void UpdateBatteryStatus(const BatteryStatus&); // Inherited from PlatformEventDispatcher. - void StartListening() override; + void StartListening(LocalFrame* frame) override; void StopListening() override; device::mojom::blink::BatteryMonitorPtr monitor_; diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc b/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc index aea017ee4e9..826039ea127 100644 --- a/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc +++ b/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc @@ -113,8 +113,10 @@ void BatteryManager::ContextDestroyed(ExecutionContext*) { bool BatteryManager::HasPendingActivity() const { // Prevent V8 from garbage collecting the wrapper object if there are - // event listeners attached to it. - return GetExecutionContext() && HasEventListeners(); + // event listeners or pending promises attached to it. + return HasEventListeners() || + (battery_property_ && + battery_property_->GetState() == ScriptPromisePropertyBase::kPending); } void BatteryManager::Trace(blink::Visitor* visitor) { diff --git a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.idl b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.idl index 4cdc46edf1b..579ee188799 100644 --- a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.idl +++ b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.idl @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// https://w3c.github.io/battery/#the-navigator-interface [ ImplementedAs=NavigatorBattery ] partial interface Navigator { |