зеркало из https://github.com/mozilla/pjs.git
Don't leak static mLoadGroup.
This commit is contained in:
Родитель
019282bedf
Коммит
870f1d7fac
|
@ -249,7 +249,6 @@ class InternetSearchDataSource : public nsIInternetSearchService,
|
||||||
private:
|
private:
|
||||||
static PRInt32 gRefCnt;
|
static PRInt32 gRefCnt;
|
||||||
static PRBool mEngineListBuilt;
|
static PRBool mEngineListBuilt;
|
||||||
static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
|
||||||
|
|
||||||
// pseudo-constants
|
// pseudo-constants
|
||||||
static nsIRDFResource *kNC_SearchResult;
|
static nsIRDFResource *kNC_SearchResult;
|
||||||
|
@ -290,6 +289,7 @@ static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
||||||
protected:
|
protected:
|
||||||
static nsIRDFDataSource *mInner;
|
static nsIRDFDataSource *mInner;
|
||||||
|
|
||||||
|
static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
||||||
static nsCOMPtr<nsIRDFDataSource> categoryDataSource;
|
static nsCOMPtr<nsIRDFDataSource> categoryDataSource;
|
||||||
|
|
||||||
friend NS_IMETHODIMP NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
friend NS_IMETHODIMP NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
||||||
|
@ -487,12 +487,14 @@ InternetSearchDataSource::~InternetSearchDataSource (void)
|
||||||
|
|
||||||
NS_IF_RELEASE(mInner);
|
NS_IF_RELEASE(mInner);
|
||||||
|
|
||||||
|
mLoadGroup = nsnull;
|
||||||
|
categoryDataSource = nsnull;
|
||||||
|
|
||||||
if (gRDFService)
|
if (gRDFService)
|
||||||
{
|
{
|
||||||
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
|
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
|
||||||
gRDFService = nsnull;
|
gRDFService = nsnull;
|
||||||
}
|
}
|
||||||
categoryDataSource = NULL;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче