зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1476250 - Simplify HAL initialization and shutdown to reduce the chance of leaks and UAFs r=froydnj
This patch initializes some HAL components greedily so that we can get rid of lazy initializers within the code. Observers are still lazily initialized because they can be instanced within content processes but that doesn't always happen and we don't want to pay the memory price for structures we don't use. Shutdown is now happening at a fixed time for all HAL components save WakeLocks. This ensures that we don't destroy an object while still iterating over it, something that could happen before. Finally a workaround for a compiler limitation has been removed. Differential Revision: https://phabricator.services.mozilla.com/D3100 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Gabriele Svelto
Родитель
f6e7b25483
Коммит
b0e6709e13
306
hal/Hal.cpp
306
hal/Hal.cpp
|
|
@ -9,6 +9,7 @@
|
|||
#include "HalImpl.h"
|
||||
#include "HalLog.h"
|
||||
#include "HalSandbox.h"
|
||||
#include "HalWakeLockInternal.h"
|
||||
#include "nsIDOMWindow.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsIDocShell.h"
|
||||
|
|
@ -57,6 +58,8 @@ using namespace mozilla::dom;
|
|||
namespace mozilla {
|
||||
namespace hal {
|
||||
|
||||
static bool sInitialized = false;
|
||||
|
||||
mozilla::LogModule *
|
||||
GetHalLog()
|
||||
{
|
||||
|
|
@ -95,10 +98,35 @@ WindowIsActive(nsPIDOMWindowInner* aWindow)
|
|||
|
||||
StaticAutoPtr<WindowIdentifier::IDArrayType> gLastIDToVibrate;
|
||||
|
||||
void InitLastIDToVibrate()
|
||||
static void
|
||||
RecordLastIDToVibrate(const WindowIdentifier& aId)
|
||||
{
|
||||
gLastIDToVibrate = new WindowIdentifier::IDArrayType();
|
||||
ClearOnShutdown(&gLastIDToVibrate);
|
||||
if (!InSandbox()) {
|
||||
*gLastIDToVibrate = aId.AsArray();
|
||||
}
|
||||
}
|
||||
|
||||
static bool
|
||||
MayCancelVibration(const WindowIdentifier& aId)
|
||||
{
|
||||
// Although only active windows may start vibrations, a window may
|
||||
// cancel its own vibration even if it's no longer active.
|
||||
//
|
||||
// After a window is marked as inactive, it sends a CancelVibrate
|
||||
// request. We want this request to cancel a playing vibration
|
||||
// started by that window, so we certainly don't want to reject the
|
||||
// cancellation request because the window is now inactive.
|
||||
//
|
||||
// But it could be the case that, after this window became inactive,
|
||||
// some other window came along and started a vibration. We don't
|
||||
// want this window's cancellation request to cancel that window's
|
||||
// actively-playing vibration!
|
||||
//
|
||||
// To solve this problem, we keep track of the id of the last window
|
||||
// to start a vibration, and only accepts cancellation requests from
|
||||
// the same window. All other cancellation requests are ignored.
|
||||
|
||||
return InSandbox() || (*gLastIDToVibrate == aId.AsArray());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
|
@ -125,12 +153,7 @@ Vibrate(const nsTArray<uint32_t>& pattern, const WindowIdentifier &id)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!InSandbox()) {
|
||||
if (!gLastIDToVibrate) {
|
||||
InitLastIDToVibrate();
|
||||
}
|
||||
*gLastIDToVibrate = id.AsArray();
|
||||
}
|
||||
RecordLastIDToVibrate(id);
|
||||
|
||||
// Don't forward our ID if we are not in the sandbox, because hal_impl
|
||||
// doesn't need it, and we don't want it to be tempted to read it. The
|
||||
|
|
@ -149,24 +172,7 @@ CancelVibrate(const WindowIdentifier &id)
|
|||
{
|
||||
AssertMainThread();
|
||||
|
||||
// Although only active windows may start vibrations, a window may
|
||||
// cancel its own vibration even if it's no longer active.
|
||||
//
|
||||
// After a window is marked as inactive, it sends a CancelVibrate
|
||||
// request. We want this request to cancel a playing vibration
|
||||
// started by that window, so we certainly don't want to reject the
|
||||
// cancellation request because the window is now inactive.
|
||||
//
|
||||
// But it could be the case that, after this window became inactive,
|
||||
// some other window came along and started a vibration. We don't
|
||||
// want this window's cancellation request to cancel that window's
|
||||
// actively-playing vibration!
|
||||
//
|
||||
// To solve this problem, we keep track of the id of the last window
|
||||
// to start a vibration, and only accepts cancellation requests from
|
||||
// the same window. All other cancellation requests are ignored.
|
||||
|
||||
if (InSandbox() || (gLastIDToVibrate && *gLastIDToVibrate == id.AsArray())) {
|
||||
if (MayCancelVibration(id)) {
|
||||
// Don't forward our ID if we are not in the sandbox, because hal_impl
|
||||
// doesn't need it, and we don't want it to be tempted to read it. The
|
||||
// empty identifier will assert if it's used.
|
||||
|
|
@ -179,52 +185,40 @@ class ObserversManager
|
|||
{
|
||||
public:
|
||||
void AddObserver(Observer<InfoType>* aObserver) {
|
||||
if (!mObservers) {
|
||||
mObservers = new mozilla::ObserverList<InfoType>();
|
||||
}
|
||||
mObservers.AddObserver(aObserver);
|
||||
|
||||
mObservers->AddObserver(aObserver);
|
||||
|
||||
if (mObservers->Length() == 1) {
|
||||
if (mObservers.Length() == 1) {
|
||||
EnableNotifications();
|
||||
}
|
||||
}
|
||||
|
||||
void RemoveObserver(Observer<InfoType>* aObserver) {
|
||||
bool removed = mObservers && mObservers->RemoveObserver(aObserver);
|
||||
bool removed = mObservers.RemoveObserver(aObserver);
|
||||
if (!removed) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mObservers->Length() == 0) {
|
||||
if (mObservers.Length() == 0) {
|
||||
DisableNotifications();
|
||||
|
||||
OnNotificationsDisabled();
|
||||
|
||||
delete mObservers;
|
||||
mObservers = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void BroadcastInformation(const InfoType& aInfo) {
|
||||
// It is possible for mObservers to be nullptr here on some platforms,
|
||||
// because a call to BroadcastInformation gets queued up asynchronously
|
||||
// while RemoveObserver is running (and before the notifications are
|
||||
// disabled). The queued call can then get run after mObservers has
|
||||
// been nulled out. See bug 757025.
|
||||
if (!mObservers) {
|
||||
return;
|
||||
}
|
||||
mObservers->Broadcast(aInfo);
|
||||
mObservers.Broadcast(aInfo);
|
||||
}
|
||||
|
||||
protected:
|
||||
~ObserversManager() {
|
||||
MOZ_ASSERT(mObservers.Length() == 0);
|
||||
}
|
||||
|
||||
virtual void EnableNotifications() = 0;
|
||||
virtual void DisableNotifications() = 0;
|
||||
virtual void OnNotificationsDisabled() {}
|
||||
|
||||
private:
|
||||
mozilla::ObserverList<InfoType>* mObservers;
|
||||
mozilla::ObserverList<InfoType> mObservers;
|
||||
};
|
||||
|
||||
template <class InfoType>
|
||||
|
|
@ -262,7 +256,8 @@ private:
|
|||
bool mHasValidCache;
|
||||
};
|
||||
|
||||
class BatteryObserversManager : public CachingObserversManager<BatteryInformation>
|
||||
class BatteryObserversManager final
|
||||
: public CachingObserversManager<BatteryInformation>
|
||||
{
|
||||
protected:
|
||||
void EnableNotifications() override {
|
||||
|
|
@ -278,15 +273,8 @@ protected:
|
|||
}
|
||||
};
|
||||
|
||||
static BatteryObserversManager&
|
||||
BatteryObservers()
|
||||
{
|
||||
static BatteryObserversManager sBatteryObservers;
|
||||
AssertMainThread();
|
||||
return sBatteryObservers;
|
||||
}
|
||||
|
||||
class NetworkObserversManager : public CachingObserversManager<NetworkInformation>
|
||||
class NetworkObserversManager final
|
||||
: public CachingObserversManager<NetworkInformation>
|
||||
{
|
||||
protected:
|
||||
void EnableNotifications() override {
|
||||
|
|
@ -302,15 +290,8 @@ protected:
|
|||
}
|
||||
};
|
||||
|
||||
static NetworkObserversManager&
|
||||
NetworkObservers()
|
||||
{
|
||||
static NetworkObserversManager sNetworkObservers;
|
||||
AssertMainThread();
|
||||
return sNetworkObservers;
|
||||
}
|
||||
|
||||
class WakeLockObserversManager : public ObserversManager<WakeLockInformation>
|
||||
class WakeLockObserversManager final
|
||||
: public ObserversManager<WakeLockInformation>
|
||||
{
|
||||
protected:
|
||||
void EnableNotifications() override {
|
||||
|
|
@ -322,15 +303,8 @@ protected:
|
|||
}
|
||||
};
|
||||
|
||||
static WakeLockObserversManager&
|
||||
WakeLockObservers()
|
||||
{
|
||||
static WakeLockObserversManager sWakeLockObservers;
|
||||
AssertMainThread();
|
||||
return sWakeLockObservers;
|
||||
}
|
||||
|
||||
class ScreenConfigurationObserversManager : public CachingObserversManager<ScreenConfiguration>
|
||||
class ScreenConfigurationObserversManager final
|
||||
: public CachingObserversManager<ScreenConfiguration>
|
||||
{
|
||||
protected:
|
||||
void EnableNotifications() override {
|
||||
|
|
@ -346,27 +320,49 @@ protected:
|
|||
}
|
||||
};
|
||||
|
||||
static ScreenConfigurationObserversManager&
|
||||
ScreenConfigurationObservers()
|
||||
{
|
||||
typedef mozilla::ObserverList<SensorData> SensorObserverList;
|
||||
StaticAutoPtr<SensorObserverList> sSensorObservers[NUM_SENSOR_TYPE];
|
||||
|
||||
static SensorObserverList*
|
||||
GetSensorObservers(SensorType sensor_type) {
|
||||
AssertMainThread();
|
||||
static ScreenConfigurationObserversManager sScreenConfigurationObservers;
|
||||
return sScreenConfigurationObservers;
|
||||
MOZ_ASSERT(sensor_type < NUM_SENSOR_TYPE);
|
||||
|
||||
if (!sSensorObservers[sensor_type]) {
|
||||
sSensorObservers[sensor_type] = new SensorObserverList();
|
||||
}
|
||||
|
||||
return sSensorObservers[sensor_type];
|
||||
}
|
||||
|
||||
#define MOZ_IMPL_HAL_OBSERVER(name_) \
|
||||
void \
|
||||
Register##name_##Observer(name_##Observer* aObserver) \
|
||||
{ \
|
||||
AssertMainThread(); \
|
||||
name_##Observers().AddObserver(aObserver); \
|
||||
} \
|
||||
\
|
||||
void \
|
||||
Unregister##name_##Observer(name_##Observer* aObserver) \
|
||||
{ \
|
||||
AssertMainThread(); \
|
||||
name_##Observers().RemoveObserver(aObserver); \
|
||||
#define MOZ_IMPL_HAL_OBSERVER(name_) \
|
||||
StaticAutoPtr<name_##ObserversManager> s##name_##Observers; \
|
||||
\
|
||||
static name_##ObserversManager* \
|
||||
name_##Observers() \
|
||||
{ \
|
||||
AssertMainThread(); \
|
||||
\
|
||||
if (!s##name_##Observers) { \
|
||||
MOZ_ASSERT(sInitialized); \
|
||||
s##name_##Observers = new name_##ObserversManager(); \
|
||||
} \
|
||||
\
|
||||
return s##name_##Observers; \
|
||||
} \
|
||||
\
|
||||
void \
|
||||
Register##name_##Observer(name_##Observer* aObserver) \
|
||||
{ \
|
||||
AssertMainThread(); \
|
||||
name_##Observers()->AddObserver(aObserver); \
|
||||
} \
|
||||
\
|
||||
void \
|
||||
Unregister##name_##Observer(name_##Observer* aObserver) \
|
||||
{ \
|
||||
AssertMainThread(); \
|
||||
name_##Observers()->RemoveObserver(aObserver); \
|
||||
}
|
||||
|
||||
MOZ_IMPL_HAL_OBSERVER(Battery)
|
||||
|
|
@ -374,16 +370,14 @@ MOZ_IMPL_HAL_OBSERVER(Battery)
|
|||
void
|
||||
GetCurrentBatteryInformation(BatteryInformation* aInfo)
|
||||
{
|
||||
AssertMainThread();
|
||||
*aInfo = BatteryObservers().GetCurrentInformation();
|
||||
*aInfo = BatteryObservers()->GetCurrentInformation();
|
||||
}
|
||||
|
||||
void
|
||||
NotifyBatteryChange(const BatteryInformation& aInfo)
|
||||
{
|
||||
AssertMainThread();
|
||||
BatteryObservers().CacheInformation(aInfo);
|
||||
BatteryObservers().BroadcastCachedInformation();
|
||||
BatteryObservers()->CacheInformation(aInfo);
|
||||
BatteryObservers()->BroadcastCachedInformation();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -398,78 +392,30 @@ DisableSensorNotifications(SensorType aSensor) {
|
|||
PROXY_IF_SANDBOXED(DisableSensorNotifications(aSensor));
|
||||
}
|
||||
|
||||
typedef mozilla::ObserverList<SensorData> SensorObserverList;
|
||||
static SensorObserverList* gSensorObservers = nullptr;
|
||||
|
||||
static SensorObserverList &
|
||||
GetSensorObservers(SensorType sensor_type) {
|
||||
MOZ_ASSERT(sensor_type < NUM_SENSOR_TYPE);
|
||||
|
||||
if(!gSensorObservers) {
|
||||
gSensorObservers = new SensorObserverList[NUM_SENSOR_TYPE];
|
||||
}
|
||||
return gSensorObservers[sensor_type];
|
||||
}
|
||||
|
||||
void
|
||||
RegisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) {
|
||||
SensorObserverList &observers = GetSensorObservers(aSensor);
|
||||
SensorObserverList* observers = GetSensorObservers(aSensor);
|
||||
|
||||
AssertMainThread();
|
||||
|
||||
observers.AddObserver(aObserver);
|
||||
if(observers.Length() == 1) {
|
||||
observers->AddObserver(aObserver);
|
||||
if (observers->Length() == 1) {
|
||||
EnableSensorNotifications(aSensor);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
UnregisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) {
|
||||
AssertMainThread();
|
||||
|
||||
if (!gSensorObservers) {
|
||||
HAL_ERR("Un-registering a sensor when none have been registered");
|
||||
return;
|
||||
}
|
||||
|
||||
SensorObserverList &observers = GetSensorObservers(aSensor);
|
||||
if (!observers.RemoveObserver(aObserver) || observers.Length() > 0) {
|
||||
SensorObserverList* observers = GetSensorObservers(aSensor);
|
||||
if (!observers->RemoveObserver(aObserver) || observers->Length() > 0) {
|
||||
return;
|
||||
}
|
||||
DisableSensorNotifications(aSensor);
|
||||
|
||||
for (int i = 0; i < NUM_SENSOR_TYPE; i++) {
|
||||
if (gSensorObservers[i].Length() > 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// We want to destroy gSensorObservers if all observer lists are
|
||||
// empty, but we have to defer the deallocation via a runnable to
|
||||
// mainthread (since we may be inside NotifySensorChange()/Broadcast()
|
||||
// when it calls UnregisterSensorObserver()).
|
||||
SensorObserverList* sensorlists = gSensorObservers;
|
||||
gSensorObservers = nullptr;
|
||||
|
||||
// Unlike DispatchToMainThread, DispatchToCurrentThread doesn't leak a runnable if
|
||||
// it fails (and we assert we're on MainThread).
|
||||
if (NS_FAILED(NS_DispatchToCurrentThread(NS_NewRunnableFunction("UnregisterSensorObserver",
|
||||
[sensorlists]() -> void {
|
||||
delete [] sensorlists;
|
||||
}))))
|
||||
{
|
||||
// Still need to delete sensorlists if the dispatch fails
|
||||
delete [] sensorlists;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
NotifySensorChange(const SensorData &aSensorData) {
|
||||
SensorObserverList &observers = GetSensorObservers(aSensorData.sensor());
|
||||
SensorObserverList* observers = GetSensorObservers(aSensorData.sensor());
|
||||
|
||||
AssertMainThread();
|
||||
|
||||
observers.Broadcast(aSensorData);
|
||||
observers->Broadcast(aSensorData);
|
||||
}
|
||||
|
||||
MOZ_IMPL_HAL_OBSERVER(Network)
|
||||
|
|
@ -477,15 +423,14 @@ MOZ_IMPL_HAL_OBSERVER(Network)
|
|||
void
|
||||
GetCurrentNetworkInformation(NetworkInformation* aInfo)
|
||||
{
|
||||
AssertMainThread();
|
||||
*aInfo = NetworkObservers().GetCurrentInformation();
|
||||
*aInfo = NetworkObservers()->GetCurrentInformation();
|
||||
}
|
||||
|
||||
void
|
||||
NotifyNetworkChange(const NetworkInformation& aInfo)
|
||||
{
|
||||
NetworkObservers().CacheInformation(aInfo);
|
||||
NetworkObservers().BroadcastCachedInformation();
|
||||
NetworkObservers()->CacheInformation(aInfo);
|
||||
NetworkObservers()->BroadcastCachedInformation();
|
||||
}
|
||||
|
||||
MOZ_IMPL_HAL_OBSERVER(WakeLock)
|
||||
|
|
@ -518,7 +463,7 @@ void
|
|||
NotifyWakeLockChange(const WakeLockInformation& aInfo)
|
||||
{
|
||||
AssertMainThread();
|
||||
WakeLockObservers().BroadcastInformation(aInfo);
|
||||
WakeLockObservers()->BroadcastInformation(aInfo);
|
||||
}
|
||||
|
||||
MOZ_IMPL_HAL_OBSERVER(ScreenConfiguration)
|
||||
|
|
@ -526,15 +471,15 @@ MOZ_IMPL_HAL_OBSERVER(ScreenConfiguration)
|
|||
void
|
||||
GetCurrentScreenConfiguration(ScreenConfiguration* aScreenConfiguration)
|
||||
{
|
||||
AssertMainThread();
|
||||
*aScreenConfiguration = ScreenConfigurationObservers().GetCurrentInformation();
|
||||
*aScreenConfiguration =
|
||||
ScreenConfigurationObservers()->GetCurrentInformation();
|
||||
}
|
||||
|
||||
void
|
||||
NotifyScreenConfigurationChange(const ScreenConfiguration& aScreenConfiguration)
|
||||
{
|
||||
ScreenConfigurationObservers().CacheInformation(aScreenConfiguration);
|
||||
ScreenConfigurationObservers().BroadcastCachedInformation();
|
||||
ScreenConfigurationObservers()->CacheInformation(aScreenConfiguration);
|
||||
ScreenConfigurationObservers()->BroadcastCachedInformation();
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
@ -608,5 +553,38 @@ StopDiskSpaceWatcher()
|
|||
PROXY_IF_SANDBOXED(StopDiskSpaceWatcher());
|
||||
}
|
||||
|
||||
void
|
||||
Init()
|
||||
{
|
||||
MOZ_ASSERT(!sInitialized);
|
||||
|
||||
if (!InSandbox()) {
|
||||
gLastIDToVibrate = new WindowIdentifier::IDArrayType();
|
||||
}
|
||||
|
||||
WakeLockInit();
|
||||
|
||||
sInitialized = true;
|
||||
}
|
||||
|
||||
void
|
||||
Shutdown()
|
||||
{
|
||||
MOZ_ASSERT(sInitialized);
|
||||
|
||||
gLastIDToVibrate = nullptr;
|
||||
|
||||
sBatteryObservers = nullptr;
|
||||
sNetworkObservers = nullptr;
|
||||
sWakeLockObservers = nullptr;
|
||||
sScreenConfigurationObservers = nullptr;
|
||||
|
||||
for (auto& sensorObserver : sSensorObservers) {
|
||||
sensorObserver = nullptr;
|
||||
}
|
||||
|
||||
sInitialized = false;
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace mozilla
|
||||
|
|
|
|||
11
hal/Hal.h
11
hal/Hal.h
|
|
@ -45,6 +45,17 @@ class WindowIdentifier;
|
|||
|
||||
namespace MOZ_HAL_NAMESPACE {
|
||||
|
||||
/**
|
||||
* Initializes the HAL. This must be called before any other HAL function.
|
||||
*/
|
||||
void Init();
|
||||
|
||||
/**
|
||||
* Shuts down the HAL. Besides freeing all the used resources this will check
|
||||
* that all observers have been properly deregistered and assert if not.
|
||||
*/
|
||||
void Shutdown();
|
||||
|
||||
/**
|
||||
* Turn the default vibrator device on/off per the pattern specified
|
||||
* by |pattern|. Each element in the pattern is the number of
|
||||
|
|
|
|||
|
|
@ -36,23 +36,15 @@ typedef nsClassHashtable<nsStringHashKey, ProcessLockTable> LockTable;
|
|||
|
||||
int sActiveListeners = 0;
|
||||
StaticAutoPtr<LockTable> sLockTable;
|
||||
bool sInitialized = false;
|
||||
bool sIsShuttingDown = false;
|
||||
|
||||
WakeLockInformation
|
||||
WakeLockInfoFromLockCount(const nsAString& aTopic, const LockCount& aLockCount)
|
||||
{
|
||||
// TODO: Once we abandon b2g18, we can switch this to use the
|
||||
// WakeLockInformation constructor, which is better because it doesn't let us
|
||||
// forget to assign a param. For now we have to do it this way, because
|
||||
// b2g18 doesn't have the nsTArray <--> InfallibleTArray conversion (bug
|
||||
// 819791).
|
||||
nsString topic(aTopic);
|
||||
WakeLockInformation info(topic, aLockCount.numLocks, aLockCount.numHidden,
|
||||
aLockCount.processes);
|
||||
|
||||
WakeLockInformation info;
|
||||
info.topic() = aTopic;
|
||||
info.numLocks() = aLockCount.numLocks;
|
||||
info.numHidden() = aLockCount.numHidden;
|
||||
info.lockingProcesses().AppendElements(aLockCount.processes);
|
||||
return info;
|
||||
}
|
||||
|
||||
|
|
@ -146,11 +138,16 @@ CleanupOnContentShutdown::Observe(nsISupports* aSubject, const char* aTopic, con
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
namespace hal {
|
||||
|
||||
void
|
||||
Init()
|
||||
WakeLockInit()
|
||||
{
|
||||
sLockTable = new LockTable();
|
||||
sInitialized = true;
|
||||
|
||||
nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
|
||||
if (obs) {
|
||||
|
|
@ -159,11 +156,6 @@ Init()
|
|||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
namespace hal {
|
||||
|
||||
WakeLockState
|
||||
ComputeWakeLockState(int aNumLocks, int aNumHidden)
|
||||
|
|
@ -205,9 +197,6 @@ ModifyWakeLock(const nsAString& aTopic,
|
|||
if (sIsShuttingDown) {
|
||||
return;
|
||||
}
|
||||
if (!sInitialized) {
|
||||
Init();
|
||||
}
|
||||
|
||||
ProcessLockTable* table = sLockTable->Get(aTopic);
|
||||
LockCount processCount;
|
||||
|
|
@ -264,9 +253,6 @@ GetWakeLockInfo(const nsAString& aTopic, WakeLockInformation* aWakeLockInfo)
|
|||
*aWakeLockInfo = WakeLockInformation();
|
||||
return;
|
||||
}
|
||||
if (!sInitialized) {
|
||||
Init();
|
||||
}
|
||||
|
||||
ProcessLockTable* table = sLockTable->Get(aTopic);
|
||||
if (!table) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef __HAL_WAKELOCK_INTERNAL_H_
|
||||
#define __HAL_WAKELOCK_INTERNAL_H_
|
||||
|
||||
namespace mozilla {
|
||||
namespace hal {
|
||||
|
||||
void WakeLockInit();
|
||||
|
||||
} // namespace hal
|
||||
} // namespace mozilla
|
||||
|
||||
#endif /* __HAL_WAKELOCK_INTERNAL_H_ */
|
||||
|
|
@ -405,6 +405,8 @@ nsAppShell::nsAppShell()
|
|||
sAppShell = this;
|
||||
}
|
||||
|
||||
hal::Init();
|
||||
|
||||
if (!XRE_IsParentProcess()) {
|
||||
if (jni::IsAvailable()) {
|
||||
GeckoThreadSupport::Init();
|
||||
|
|
@ -473,6 +475,8 @@ nsAppShell::~nsAppShell()
|
|||
sWakeLockListener = nullptr;
|
||||
}
|
||||
|
||||
hal::Shutdown();
|
||||
|
||||
if (jni::IsAvailable() && XRE_IsParentProcess()) {
|
||||
DestroyAndroidUiThread();
|
||||
AndroidBridge::DeconstructBridge();
|
||||
|
|
|
|||
|
|
@ -257,6 +257,8 @@ protected:
|
|||
|
||||
} mEventQueue;
|
||||
|
||||
private:
|
||||
|
||||
mozilla::CondVar mSyncRunFinished;
|
||||
bool mSyncRunQuit;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "mozilla/BackgroundHangMonitor.h"
|
||||
#include "GeckoProfiler.h"
|
||||
#include "ScreenHelperCocoa.h"
|
||||
#include "mozilla/Hal.h"
|
||||
#include "mozilla/widget/ScreenManager.h"
|
||||
#include "HeadlessScreenHelper.h"
|
||||
#include "pratom.h"
|
||||
|
|
@ -237,6 +238,8 @@ nsAppShell::~nsAppShell()
|
|||
{
|
||||
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
|
||||
|
||||
hal::Shutdown();
|
||||
|
||||
if (mCFRunLoop) {
|
||||
if (mCFRunLoopSource) {
|
||||
::CFRunLoopRemoveSource(mCFRunLoop, mCFRunLoopSource,
|
||||
|
|
@ -356,6 +359,8 @@ nsAppShell::Init()
|
|||
|
||||
::CFRunLoopAddSource(mCFRunLoop, mCFRunLoopSource, kCFRunLoopCommonModes);
|
||||
|
||||
hal::Init();
|
||||
|
||||
if (XRE_IsParentProcess()) {
|
||||
ScreenManager& screenManager = ScreenManager::GetSingleton();
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "mozilla/Logging.h"
|
||||
#include "prenv.h"
|
||||
#include "mozilla/BackgroundHangMonitor.h"
|
||||
#include "mozilla/Hal.h"
|
||||
#include "mozilla/Unused.h"
|
||||
#include "mozilla/WidgetUtils.h"
|
||||
#include "GeckoProfiler.h"
|
||||
|
|
@ -134,6 +135,8 @@ nsAppShell::EventProcessorCallback(GIOChannel *source,
|
|||
|
||||
nsAppShell::~nsAppShell()
|
||||
{
|
||||
mozilla::hal::Shutdown();
|
||||
|
||||
if (mTag)
|
||||
g_source_remove(mTag);
|
||||
if (mPipeFDs[0])
|
||||
|
|
@ -151,6 +154,8 @@ nsAppShell::Init()
|
|||
// is a no-op.
|
||||
g_type_init();
|
||||
|
||||
mozilla::hal::Init();
|
||||
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
if (XRE_IsParentProcess()) {
|
||||
nsCOMPtr<nsIPowerManagerService> powerManagerService =
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "WinIMEHandler.h"
|
||||
#include "mozilla/widget/AudioSession.h"
|
||||
#include "mozilla/BackgroundHangMonitor.h"
|
||||
#include "mozilla/Hal.h"
|
||||
#include "nsIDOMWakeLockListener.h"
|
||||
#include "nsIPowerManagerService.h"
|
||||
#include "mozilla/StaticPtr.h"
|
||||
|
|
@ -210,6 +211,8 @@ nsAppShell::EventWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||
|
||||
nsAppShell::~nsAppShell()
|
||||
{
|
||||
hal::Shutdown();
|
||||
|
||||
if (mEventWnd) {
|
||||
// DestroyWindow doesn't do anything when called from a non UI thread.
|
||||
// Since mEventWnd was created on the UI thread, it must be destroyed on
|
||||
|
|
@ -327,6 +330,8 @@ nsAppShell::Init()
|
|||
{
|
||||
LSPAnnotate();
|
||||
|
||||
hal::Init();
|
||||
|
||||
mozilla::ipc::windows::InitUIThread();
|
||||
|
||||
sTaskbarButtonCreatedMsg = ::RegisterWindowMessageW(kTaskbarButtonEventId);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче