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

Bug 1148161 - rename PluginModuleParent::OfflineObserver to PluginOfflineObserver r=jimm

Browse Source 
The class name clashes with mozilla::net::OfflineObserver and ends up crashing in nsTraceRefcnt::GetBloatEntry because the two classes have a different size.
This commit is contained in:
Valentin Gosu
2016-05-12 17:43:34 +02:00
parent 64aa696067
commit 283d514a0f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dom/plugins/ipc/PluginModuleParent.cpp
View File

@@ -2032,27 +2032,27 @@ PluginModuleParent::OnInitFailure()
}
}
class OfflineObserver final : public nsIObserver
class PluginOfflineObserver final : public nsIObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
explicit OfflineObserver(PluginModuleChromeParent* pmp)
explicit PluginOfflineObserver(PluginModuleChromeParent* pmp)
: mPmp(pmp)
{}
private:
~OfflineObserver() {}
~PluginOfflineObserver() {}
PluginModuleChromeParent* mPmp;
};
NS_IMPL_ISUPPORTS(OfflineObserver, nsIObserver)
NS_IMPL_ISUPPORTS(PluginOfflineObserver, nsIObserver)
NS_IMETHODIMP
OfflineObserver::Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData)
PluginOfflineObserver::Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData)
{
MOZ_ASSERT(!strcmp(aTopic, "ipc:network:set-offline"));
mPmp->CachedSettingChanged();
@@ -2072,8 +2072,8 @@ PluginModuleChromeParent::RegisterSettingsCallbacks()
nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
if (observerService) {
mOfflineObserver = new OfflineObserver(this);
observerService->AddObserver(mOfflineObserver, "ipc:network:set-offline", false);
mPluginOfflineObserver = new PluginOfflineObserver(this);
observerService->AddObserver(mPluginOfflineObserver, "ipc:network:set-offline", false);
}
}
@@ -2086,8 +2086,8 @@ PluginModuleChromeParent::UnregisterSettingsCallbacks()
nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
if (observerService) {
observerService->RemoveObserver(mOfflineObserver, "ipc:network:set-offline");
mOfflineObserver = nullptr;
observerService->RemoveObserver(mPluginOfflineObserver, "ipc:network:set-offline");
mPluginOfflineObserver = nullptr;
}
}