summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/modules/battery
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/third_party/blink/renderer/modules/battery
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/battery')
-rw-r--r--chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h2
-rw-r--r--chromium/third_party/blink/renderer/modules/battery/battery_manager.h1
-rw-r--r--chromium/third_party/blink/renderer/modules/battery/battery_manager.idl2
-rw-r--r--chromium/third_party/blink/renderer/modules/battery/navigator_battery.h2
4 files changed, 1 insertions, 6 deletions
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 905a8604c29..35ff42b67b6 100644
--- a/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h
+++ b/chromium/third_party/blink/renderer/modules/battery/battery_dispatcher.h
@@ -18,8 +18,6 @@ namespace blink {
class MODULES_EXPORT BatteryDispatcher final
: public GarbageCollected<BatteryDispatcher>,
public PlatformEventDispatcher {
- USING_GARBAGE_COLLECTED_MIXIN(BatteryDispatcher);
-
public:
static BatteryDispatcher& Instance();
diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_manager.h b/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
index 7b2dd65ce7f..6e9cfe07995 100644
--- a/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
+++ b/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
@@ -21,7 +21,6 @@ class BatteryManager final : public EventTargetWithInlineData,
public ExecutionContextLifecycleStateObserver,
public PlatformEventController {
DEFINE_WRAPPERTYPEINFO();
- USING_GARBAGE_COLLECTED_MIXIN(BatteryManager);
public:
static BatteryManager* Create(ExecutionContext*);
diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_manager.idl b/chromium/third_party/blink/renderer/modules/battery/battery_manager.idl
index 4343edf566f..aed13fb8099 100644
--- a/chromium/third_party/blink/renderer/modules/battery/battery_manager.idl
+++ b/chromium/third_party/blink/renderer/modules/battery/battery_manager.idl
@@ -7,7 +7,7 @@
ActiveScriptWrappable,
Exposed=Window
] interface BatteryManager : EventTarget {
- [HighEntropy, Measure] readonly attribute boolean charging;
+ [HighEntropy=Direct, Measure] readonly attribute boolean charging;
[HighEntropy, Measure] readonly attribute unrestricted double chargingTime;
[HighEntropy, Measure] readonly attribute unrestricted double dischargingTime;
[HighEntropy, Measure] readonly attribute double level;
diff --git a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
index dd09e544833..6e7b9e22c74 100644
--- a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
+++ b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
@@ -17,8 +17,6 @@ class Navigator;
class NavigatorBattery final : public GarbageCollected<NavigatorBattery>,
public Supplement<Navigator> {
- USING_GARBAGE_COLLECTED_MIXIN(NavigatorBattery);
-
public:
static const char kSupplementName[];