From 08fb2f306856948ecc71974dd98c0a6d78df25aa Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Tue, 28 Jul 2020 15:46:41 +0000
Subject: Issue #1391 - Remove the DOM battery API

---
 hal/sandbox/PHal.ipdl      | 12 -----------
 hal/sandbox/SandboxHal.cpp | 51 ----------------------------------------------
 2 files changed, 63 deletions(-)

(limited to 'hal/sandbox')

diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl
index 1af550aff..8701e1219 100644
--- a/hal/sandbox/PHal.ipdl
+++ b/hal/sandbox/PHal.ipdl
@@ -20,12 +20,6 @@ using PRTime from "prtime.h";
 namespace mozilla {
 
 namespace hal {
-struct BatteryInformation {
-  double level;
-  bool   charging;
-  double remainingTime;
-};
-
 struct SensorData {
   SensorType sensor;
   PRTime timestamp;
@@ -69,7 +63,6 @@ nested(upto inside_cpow) sync protocol PHal {
     manager PContent;
 
 child:
-    async NotifyBatteryChange(BatteryInformation aBatteryInfo);
     async NotifyNetworkChange(NetworkInformation aNetworkInfo);
     async NotifyWakeLockChange(WakeLockInformation aWakeLockInfo);
     async NotifyScreenConfigurationChange(ScreenConfiguration aScreenOrientation);
@@ -80,11 +73,6 @@ parent:
     async Vibrate(uint32_t[] pattern, uint64_t[] id, PBrowser browser);
     async CancelVibrate(uint64_t[] id, PBrowser browser);
 
-    async EnableBatteryNotifications();
-    async DisableBatteryNotifications();
-    sync GetCurrentBatteryInformation()
-      returns (BatteryInformation aBatteryInfo);
-
     async EnableNetworkNotifications();
     async DisableNetworkNotifications();
     sync GetCurrentNetworkInformation()
diff --git a/hal/sandbox/SandboxHal.cpp b/hal/sandbox/SandboxHal.cpp
index aeaeb724e..579f3b472 100644
--- a/hal/sandbox/SandboxHal.cpp
+++ b/hal/sandbox/SandboxHal.cpp
@@ -13,7 +13,6 @@
 #include "mozilla/hal_sandbox/PHalParent.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/dom/TabChild.h"
-#include "mozilla/dom/battery/Types.h"
 #include "mozilla/dom/network/Types.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "mozilla/EnumeratedRange.h"
@@ -69,24 +68,6 @@ CancelVibrate(const WindowIdentifier &id)
   Hal()->SendCancelVibrate(newID.AsArray(), TabChild::GetFrom(newID.GetWindow()));
 }
 
-void
-EnableBatteryNotifications()
-{
-  Hal()->SendEnableBatteryNotifications();
-}
-
-void
-DisableBatteryNotifications()
-{
-  Hal()->SendDisableBatteryNotifications();
-}
-
-void
-GetCurrentBatteryInformation(BatteryInformation* aBatteryInfo)
-{
-  Hal()->SendGetCurrentBatteryInformation(aBatteryInfo);
-}
-
 void
 EnableNetworkNotifications()
 {
@@ -376,7 +357,6 @@ bool SystemServiceIsRunning(const char* aSvcName)
 }
 
 class HalParent : public PHalParent
-                , public BatteryObserver
                 , public NetworkObserver
                 , public ISensorObserver
                 , public WakeLockObserver
@@ -390,7 +370,6 @@ public:
   {
     // NB: you *must* unconditionally unregister your observer here,
     // if it *may* be registered below.
-    hal::UnregisterBatteryObserver(this);
     hal::UnregisterNetworkObserver(this);
     hal::UnregisterScreenConfigurationObserver(this);
     for (auto sensor : MakeEnumeratedRange(NUM_SENSOR_TYPE)) {
@@ -431,30 +410,6 @@ public:
     return true;
   }
 
-  virtual bool
-  RecvEnableBatteryNotifications() override {
-    // We give all content battery-status permission.
-    hal::RegisterBatteryObserver(this);
-    return true;
-  }
-
-  virtual bool
-  RecvDisableBatteryNotifications() override {
-    hal::UnregisterBatteryObserver(this);
-    return true;
-  }
-
-  virtual bool
-  RecvGetCurrentBatteryInformation(BatteryInformation* aBatteryInfo) override {
-    // We give all content battery-status permission.
-    hal::GetCurrentBatteryInformation(aBatteryInfo);
-    return true;
-  }
-
-  void Notify(const BatteryInformation& aBatteryInfo) override {
-    Unused << SendNotifyBatteryChange(aBatteryInfo);
-  }
-
   virtual bool
   RecvEnableNetworkNotifications() override {
     // We give all content access to this network-status information.
@@ -768,12 +723,6 @@ public:
     sHalChildDestroyed = true;
   }
 
-  virtual bool
-  RecvNotifyBatteryChange(const BatteryInformation& aBatteryInfo) override {
-    hal::NotifyBatteryChange(aBatteryInfo);
-    return true;
-  }
-
   virtual bool
   RecvNotifySensorChange(const hal::SensorData &aSensorData) override;
 
-- 
cgit v1.2.3