corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1249738 - make sWakeLockObservers a function static r=dhylands

Browse Source
This commit is contained in:
Trevor Saunders
2016-02-19 11:37:34 -05:00
parent c6bd5b78af
commit f6d25106fd
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hal/Hal.cpp
View File

@@ -336,7 +336,13 @@ protected:
} }
}; };
static WakeLockObserversManager&
WakeLockObservers()
{
static WakeLockObserversManager sWakeLockObservers; static WakeLockObserversManager sWakeLockObservers;
AssertMainThread();
return sWakeLockObservers;
}
class ScreenConfigurationObserversManager : public CachingObserversManager<ScreenConfiguration> class ScreenConfigurationObserversManager : public CachingObserversManager<ScreenConfiguration>
{ {
@@ -663,14 +669,14 @@ void
RegisterWakeLockObserver(WakeLockObserver* aObserver) RegisterWakeLockObserver(WakeLockObserver* aObserver)
{ {
AssertMainThread(); AssertMainThread();
sWakeLockObservers.AddObserver(aObserver); WakeLockObservers().AddObserver(aObserver);
} }
void void
UnregisterWakeLockObserver(WakeLockObserver* aObserver) UnregisterWakeLockObserver(WakeLockObserver* aObserver)
{ {
AssertMainThread(); AssertMainThread();
sWakeLockObservers.RemoveObserver(aObserver); WakeLockObservers().RemoveObserver(aObserver);
} }
void void
@@ -701,7 +707,7 @@ void
NotifyWakeLockChange(const WakeLockInformation& aInfo) NotifyWakeLockChange(const WakeLockInformation& aInfo)
{ {
AssertMainThread(); AssertMainThread();
sWakeLockObservers.BroadcastInformation(aInfo); WakeLockObservers().BroadcastInformation(aInfo);
} }
void void