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

Fix bustage from bug 578392 (r=sayrer on the bustage fix).

Browse Source
This commit is contained in:
Blake Kaplan 2010-07-14 17:39:22 -07:00
parent febd9cf0bc
commit 3ca0e8e3e3
2 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
modules/libpref/src/nsPrefBranch.cpp
View File

@ -765,12 +765,6 @@ NS_IMETHODIMP nsPrefBranch::AddObserver(const char *aDomain, nsIObserver *aObser
NS_IMETHODIMP nsPrefBranch::RemoveObserver(const char *aDomain, nsIObserver *aObserver)
{
const char *pref;
PrefCallbackData *pCallback;
PRInt32 count;
PRInt32 i;
nsresult rv;
NS_ENSURE_ARG_POINTER(aDomain);
NS_ENSURE_ARG_POINTER(aObserver);
@ -791,52 +785,9 @@ NS_IMETHODIMP nsPrefBranch::RemoveObserver(const char *aDomain, nsIObserver *aOb
if (!mObservers)
return NS_OK;
// need to find the index of observer, so we can remove it from the domain list too
count = mObservers->Count();
if (count == 0)
return NS_OK;
nsCOMPtr<nsISupports> canonical(do_QueryInterface(aObserver));
#ifdef DEBUG
PRBool alreadyRemoved = PR_FALSE;
#endif
for (i = 0; i < count; i++) {
pCallback = (PrefCallbackData *)mObservers->ElementAt(i);
#ifdef DEBUG
if (!pCallback) {
// Have to assume that the callback we're looking for was already
// removed in freeObserverList below.
alreadyRemoved = PR_TRUE;
}
#endif
if (pCallback &&
pCallback->pCanonical == canonical &&
!strcmp(pCallback->pDomain, aDomain)) {
// We must pass a fully qualified preference name to remove the callback
pref = getPrefName(aDomain); // aDomain == nsnull only possible failure, trapped above
rv = PREF_UnregisterCallback(pref, NotifyObserver, pCallback);
if (NS_SUCCEEDED(rv)) {
// Remove this observer from our array so that nobody else can remove
// what we're trying to remove ourselves right now.
mObservers->RemoveElementAt(i);
if (pCallback->pWeakRef) {
NS_RELEASE(pCallback->pWeakRef);
} else {
NS_RELEASE(pCallback->pObserver);
}
NS_Free(pCallback);
}
return rv;
}
}
NS_WARN_IF_FALSE(alreadyRemoved,
"Failed attempt to remove a pref observer, probably leaking");
return NS_OK;
return RemoveObserverFromList(aDomain, canonical);
}
NS_IMETHODIMP nsPrefBranch::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
@ -872,7 +823,7 @@ static nsresult NotifyObserver(const char *newpref, void *data)
observer = do_QueryReferent(pData->pWeakRef);
if (!observer) {
// this weak referenced observer went away, remove them from the list
pData->pBranch->RemoveObserver(pData->pDomain, pData->pObserver);
pData->pBranch->RemoveObserverFromList(pData->pDomain, pData->pCanonical);
return NS_OK;
}
} else {
@ -918,6 +869,55 @@ void nsPrefBranch::freeObserverList(void)
mObservers = 0;
}
}
nsresult
nsPrefBranch::RemoveObserverFromList(const char *aDomain, nsISupports *aObserver)
{
PRInt32 count = mObservers->Count();
if (!count) {
return NS_OK;
}
#ifdef DEBUG
PRBool alreadyRemoved = PR_FALSE;
#endif
for (PRInt32 i = 0; i < count; i++) {
PrefCallbackData *pCallback = (PrefCallbackData *)mObservers->ElementAt(i);
#ifdef DEBUG
if (!pCallback) {
// Have to assume that the callback we're looking for was already
// removed in freeObserverList below.
alreadyRemoved = PR_TRUE;
}
#endif
if (pCallback &&
pCallback->pCanonical == aObserver &&
!strcmp(pCallback->pDomain, aDomain)) {
// We must pass a fully qualified preference name to remove the callback
const char *pref = getPrefName(aDomain); // aDomain == nsnull only possible failure, trapped above
nsresult rv = PREF_UnregisterCallback(pref, NotifyObserver, pCallback);
if (NS_SUCCEEDED(rv)) {
// Remove this observer from our array so that nobody else can remove
// what we're trying to remove ourselves right now.
mObservers->RemoveElementAt(i);
if (pCallback->pWeakRef) {
NS_RELEASE(pCallback->pWeakRef);
} else {
NS_RELEASE(pCallback->pObserver);
}
NS_Free(pCallback);
}
return rv;
}
}
NS_WARN_IF_FALSE(alreadyRemoved,
"Failed attempt to remove a pref observer, probably leaking");
return NS_OK;
}
nsresult nsPrefBranch::GetDefaultFromPropertiesFile(const char *aPrefName, PRUnichar **return_buf)
{

4
modules/libpref/src/nsPrefBranch.h
View File

@ -67,8 +67,10 @@ public:
PRInt32 GetRootLength() { return mPrefRootLength; }
nsresult RemoveObserverFromList(const char *aDomain, nsISupports *aObserver);
protected:
nsPrefBranch() /* disallow use of this constructer */
nsPrefBranch() /* disallow use of this constructer */
{ }
nsresult GetDefaultFromPropertiesFile(const char *aPrefName, PRUnichar **return_buf);