wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 789130: Unregister hal observers on HalParent::ActorDestroy(), and make Unregister*() functions resilient to unregister-of-not-registered observers. r=jlebar

Browse Source
This commit is contained in:
Chris Jones 2012-09-06 14:58:36 -07:00
parent 0d539218ab
commit e2b60610ac
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
hal/Hal.cpp
View File

@ -185,22 +185,11 @@ public:
}
void RemoveObserver(Observer<InfoType>* aObserver) {
// If mObservers is null, that means there are no observers.
// In addition, if RemoveObserver() returns false, that means we didn't
// find the observer.
// In both cases, that is a logical error we want to make sure the developer
// notices.
MOZ_ASSERT(mObservers);
#ifndef DEBUG
if (!mObservers) {
bool removed = mObservers && mObservers->RemoveObserver(aObserver);
if (!removed) {
NS_WARNING("RemoveObserver() called for unregistered observer");
return;
}
#endif
DebugOnly<bool> removed = mObservers->RemoveObserver(aObserver);
MOZ_ASSERT(removed);
if (mObservers->Length() == 0) {
DisableNotifications();
@ -208,7 +197,7 @@ public:
OnNotificationsDisabled();
delete mObservers;
mObservers = 0;
mObservers = nullptr;
}
}
@ -452,14 +441,15 @@ DisableSensorNotifications(SensorType aSensor) {
}
typedef mozilla::ObserverList<SensorData> SensorObserverList;
static SensorObserverList* gSensorObservers = NULL;
static SensorObserverList* gSensorObservers = nullptr;
static SensorObserverList &
GetSensorObservers(SensorType sensor_type) {
MOZ_ASSERT(sensor_type < NUM_SENSOR_TYPE);
if(gSensorObservers == NULL)
if(!gSensorObservers) {
gSensorObservers = new SensorObserverList[NUM_SENSOR_TYPE];
}
return gSensorObservers[sensor_type];
}
@ -477,12 +467,14 @@ RegisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) {
void
UnregisterSensorObserver(SensorType aSensor, ISensorObserver *aObserver) {
SensorObserverList &observers = GetSensorObservers(aSensor);
AssertMainThread();
observers.RemoveObserver(aObserver);
if (observers.Length() > 0) {
if (!gSensorObservers) {
return;
}
SensorObserverList &observers = GetSensorObservers(aSensor);
if (!observers.RemoveObserver(aObserver) || observers.Length() > 0) {
return;
}
DisableSensorNotifications(aSensor);
@ -683,12 +675,18 @@ void
UnregisterSwitchObserver(hal::SwitchDevice aDevice, hal::SwitchObserver *aObserver)
{
AssertMainThread();
SwitchObserverList& observer = GetSwitchObserverList(aDevice);
observer.RemoveObserver(aObserver);
if (observer.Length() == 0) {
DisableSwitchNotifications(aDevice);
ReleaseObserversIfNeeded();
if (!sSwitchObserverLists) {
return;
}
SwitchObserverList& observer = GetSwitchObserverList(aDevice);
if (!observer.RemoveObserver(aObserver) || observer.Length() > 0) {
return;
}
DisableSwitchNotifications(aDevice);
ReleaseObserversIfNeeded();
}
void
@ -719,7 +717,7 @@ void
UnregisterTheOneAlarmObserver()
{
if (sAlarmObserver) {
sAlarmObserver = NULL;
sAlarmObserver = nullptr;
PROXY_IF_SANDBOXED(DisableAlarm());
}
}

15
hal/sandbox/SandboxHal.cpp
View File

@ -304,6 +304,21 @@ class HalParent : public PHalParent
, public SwitchObserver
{
public:
virtual void
ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE
{
// NB: you *must* unconditionally unregister your observer here,
// if it *may* be registered below.
hal::UnregisterBatteryObserver(this);
hal::UnregisterNetworkObserver(this);
hal::UnregisterScreenConfigurationObserver(this);
for (int32_t sensor = SENSOR_UNKNOWN + 1;
sensor < NUM_SENSOR_TYPE; ++sensor) {
hal::UnregisterSensorObserver(SensorType(sensor), this);
}
hal::UnregisterWakeLockObserver(this);
}
virtual bool
RecvVibrate(const InfallibleTArray<unsigned int>& pattern,
const InfallibleTArray<uint64_t> &id,