bug 1249738 - make sScreenConfigurationObservers a function static r=dhylands

This commit is contained in:
Trevor Saunders 2016-02-19 11:31:43 -05:00
parent e7220223eb
commit cef2ea492e

View File

@ -354,7 +354,13 @@ protected:
}
};
static ScreenConfigurationObserversManager sScreenConfigurationObservers;
static ScreenConfigurationObserversManager&
ScreenConfigurationObservers()
{
AssertMainThread();
static ScreenConfigurationObserversManager sScreenConfigurationObservers;
return sScreenConfigurationObservers;
}
void
RegisterBatteryObserver(BatteryObserver* aObserver)
@ -702,28 +708,28 @@ void
RegisterScreenConfigurationObserver(ScreenConfigurationObserver* aObserver)
{
AssertMainThread();
sScreenConfigurationObservers.AddObserver(aObserver);
ScreenConfigurationObservers().AddObserver(aObserver);
}
void
UnregisterScreenConfigurationObserver(ScreenConfigurationObserver* aObserver)
{
AssertMainThread();
sScreenConfigurationObservers.RemoveObserver(aObserver);
ScreenConfigurationObservers().RemoveObserver(aObserver);
}
void
GetCurrentScreenConfiguration(ScreenConfiguration* aScreenConfiguration)
{
AssertMainThread();
*aScreenConfiguration = sScreenConfigurationObservers.GetCurrentInformation();
*aScreenConfiguration = ScreenConfigurationObservers().GetCurrentInformation();
}
void
NotifyScreenConfigurationChange(const ScreenConfiguration& aScreenConfiguration)
{
sScreenConfigurationObservers.CacheInformation(aScreenConfiguration);
sScreenConfigurationObservers.BroadcastCachedInformation();
ScreenConfigurationObservers().CacheInformation(aScreenConfiguration);
ScreenConfigurationObservers().BroadcastCachedInformation();
}
bool