summaryrefslogtreecommitdiff
path: root/hal
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-19 11:17:11 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-19 11:17:11 +0100
commite52c019ec8377859b6df5e50ca40a40ea20702b9 (patch)
tree992b2ab06ceab42310913aee6790bbe4fde05204 /hal
parentc7668971968e044e85446d79362d7744846efdd0 (diff)
downloaduxp-e52c019ec8377859b6df5e50ca40a40ea20702b9.tar.gz
Remove dead code in the Windows battery module.
Diffstat (limited to 'hal')
-rw-r--r--hal/windows/WindowsBattery.cpp141
1 files changed, 39 insertions, 102 deletions
diff --git a/hal/windows/WindowsBattery.cpp b/hal/windows/WindowsBattery.cpp
index c1b9a31e61..520330242f 100644
--- a/hal/windows/WindowsBattery.cpp
+++ b/hal/windows/WindowsBattery.cpp
@@ -5,45 +5,20 @@
#include "Hal.h"
#include "HalImpl.h"
-#include "nsITimer.h"
#include "mozilla/Preferences.h"
#include "mozilla/dom/battery/Constants.h"
-#include "nsComponentManagerUtils.h"
#include <windows.h>
-#include "mozilla/WindowsVersion.h"
using namespace mozilla::dom::battery;
namespace mozilla {
namespace hal_impl {
-static nsCOMPtr<nsITimer> sUpdateTimer;
-
-/* Power Event API is Vista or later */
-static decltype(RegisterPowerSettingNotification)* sRegisterPowerSettingNotification = nullptr;
-static decltype(UnregisterPowerSettingNotification)* sUnregisterPowerSettingNotification = nullptr;
static HPOWERNOTIFY sPowerHandle = nullptr;
static HPOWERNOTIFY sCapacityHandle = nullptr;
static HWND sHWnd = nullptr;
-static void
-UpdateHandler(nsITimer* aTimer, void* aClosure) {
- NS_ASSERTION(!IsVistaOrLater(),
- "We shouldn't call this function for Vista or later version!");
-
- static hal::BatteryInformation sLastInfo;
- hal::BatteryInformation currentInfo;
-
- hal_impl::GetCurrentBatteryInformation(&currentInfo);
- if (sLastInfo.level() != currentInfo.level() ||
- sLastInfo.charging() != currentInfo.charging() ||
- sLastInfo.remainingTime() != currentInfo.remainingTime()) {
- hal::NotifyBatteryChange(currentInfo);
- sLastInfo = currentInfo;
- }
-}
-
static
LRESULT CALLBACK
BatteryWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
@@ -63,94 +38,56 @@ BatteryWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
void
EnableBatteryNotifications()
{
- if (IsVistaOrLater()) {
- // RegisterPowerSettingNotification is from Vista or later.
- // Use this API if available.
- HMODULE hUser32 = GetModuleHandleW(L"USER32.DLL");
- if (!sRegisterPowerSettingNotification)
- sRegisterPowerSettingNotification = (decltype(RegisterPowerSettingNotification)*)
- GetProcAddress(hUser32, "RegisterPowerSettingNotification");
- if (!sUnregisterPowerSettingNotification)
- sUnregisterPowerSettingNotification = (decltype(UnregisterPowerSettingNotification)*)
- GetProcAddress(hUser32, "UnregisterPowerSettingNotification");
-
- if (!sRegisterPowerSettingNotification ||
- !sUnregisterPowerSettingNotification) {
- NS_ASSERTION(false, "Canot find PowerSettingNotification functions.");
- return;
+ // Create custom window to watch battery event
+ // If we can get Gecko's window handle, this is unnecessary.
+
+ if (sHWnd == nullptr) {
+ WNDCLASSW wc;
+ HMODULE hSelf = GetModuleHandle(nullptr);
+
+ if (!GetClassInfoW(hSelf, L"MozillaBatteryClass", &wc)) {
+ ZeroMemory(&wc, sizeof(WNDCLASSW));
+ wc.hInstance = hSelf;
+ wc.lpfnWndProc = BatteryWindowProc;
+ wc.lpszClassName = L"MozillaBatteryClass";
+ RegisterClassW(&wc);
}
- // Create custom window to watch battery event
- // If we can get Gecko's window handle, this is unnecessary.
-
- if (sHWnd == nullptr) {
- WNDCLASSW wc;
- HMODULE hSelf = GetModuleHandle(nullptr);
-
- if (!GetClassInfoW(hSelf, L"MozillaBatteryClass", &wc)) {
- ZeroMemory(&wc, sizeof(WNDCLASSW));
- wc.hInstance = hSelf;
- wc.lpfnWndProc = BatteryWindowProc;
- wc.lpszClassName = L"MozillaBatteryClass";
- RegisterClassW(&wc);
- }
-
- sHWnd = CreateWindowW(L"MozillaBatteryClass", L"Battery Watcher",
- 0, 0, 0, 0, 0,
- nullptr, nullptr, hSelf, nullptr);
- }
-
- if (sHWnd == nullptr) {
- return;
- }
+ sHWnd = CreateWindowW(L"MozillaBatteryClass", L"Battery Watcher",
+ 0, 0, 0, 0, 0,
+ nullptr, nullptr, hSelf, nullptr);
+ }
- sPowerHandle =
- sRegisterPowerSettingNotification(sHWnd,
- &GUID_ACDC_POWER_SOURCE,
- DEVICE_NOTIFY_WINDOW_HANDLE);
- sCapacityHandle =
- sRegisterPowerSettingNotification(sHWnd,
- &GUID_BATTERY_PERCENTAGE_REMAINING,
- DEVICE_NOTIFY_WINDOW_HANDLE);
- } else
- {
- // for Windows XP. If we remove Windows XP support,
- // we should remove timer-based power notification
- sUpdateTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
- if (sUpdateTimer) {
- sUpdateTimer->InitWithFuncCallback(UpdateHandler,
- nullptr,
- Preferences::GetInt("dom.battery.timer",
- 30000 /* 30s */),
- nsITimer::TYPE_REPEATING_SLACK);
- }
+ if (sHWnd == nullptr) {
+ return;
}
+
+ sPowerHandle =
+ RegisterPowerSettingNotification(sHWnd,
+ &GUID_ACDC_POWER_SOURCE,
+ DEVICE_NOTIFY_WINDOW_HANDLE);
+ sCapacityHandle =
+ RegisterPowerSettingNotification(sHWnd,
+ &GUID_BATTERY_PERCENTAGE_REMAINING,
+ DEVICE_NOTIFY_WINDOW_HANDLE);
}
void
DisableBatteryNotifications()
{
- if (IsVistaOrLater()) {
- if (sPowerHandle) {
- sUnregisterPowerSettingNotification(sPowerHandle);
- sPowerHandle = nullptr;
- }
+ if (sPowerHandle) {
+ UnregisterPowerSettingNotification(sPowerHandle);
+ sPowerHandle = nullptr;
+ }
- if (sCapacityHandle) {
- sUnregisterPowerSettingNotification(sCapacityHandle);
- sCapacityHandle = nullptr;
- }
+ if (sCapacityHandle) {
+ UnregisterPowerSettingNotification(sCapacityHandle);
+ sCapacityHandle = nullptr;
+ }
- if (sHWnd) {
- DestroyWindow(sHWnd);
- sHWnd = nullptr;
- }
- } else
- {
- if (sUpdateTimer) {
- sUpdateTimer->Cancel();
- sUpdateTimer = nullptr;
- }
+ if (sHWnd) {
+ DestroyWindow(sHWnd);
+ sHWnd = nullptr;
}
}