Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 660568 nsImageFrame::IconLoad must call Preferences::RemoveObservers() r=roc

Browse Source
This commit is contained in:
Masayuki Nakano 2011-06-03 15:07:10 +09:00
parent b1a2c45392
commit 22b9771448
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/generic/nsImageFrame.cpp
View File

@ -1892,6 +1892,20 @@ nsImageFrame::IconLoad::IconLoad()
GetPrefs();
}
void
nsImageFrame::IconLoad::Shutdown()
{
Preferences::RemoveObservers(this, kIconLoadPrefs);
// in case the pref service releases us later
if (mLoadingImage) {
mLoadingImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mLoadingImage = nsnull;
}
if (mBrokenImage) {
mBrokenImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mBrokenImage = nsnull;
}
}
NS_IMETHODIMP
nsImageFrame::IconLoad::Observe(nsISupports *aSubject, const char* aTopic,

13
layout/generic/nsImageFrame.h
View File

@ -328,18 +328,7 @@ private:
public:
IconLoad();
void Shutdown()
{
// in case the pref service releases us later
if (mLoadingImage) {
mLoadingImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mLoadingImage = nsnull;
}
if (mBrokenImage) {
mBrokenImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mBrokenImage = nsnull;
}
}
void Shutdown();
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER