Small shrike experiment to see if can fix static mLoadGroup leak. (I'll be watching shrike until this clears.)
git-svn-id: svn://10.0.0.236/trunk@63437 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -249,7 +249,6 @@ class InternetSearchDataSource : public nsIInternetSearchService,
|
||||
private:
|
||||
static PRInt32 gRefCnt;
|
||||
static PRBool mEngineListBuilt;
|
||||
static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
||||
|
||||
// pseudo-constants
|
||||
static nsIRDFResource *kNC_SearchResult;
|
||||
@@ -290,6 +289,7 @@ static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
||||
protected:
|
||||
static nsIRDFDataSource *mInner;
|
||||
|
||||
static nsCOMPtr<nsILoadGroup> mLoadGroup;
|
||||
static nsCOMPtr<nsIRDFDataSource> categoryDataSource;
|
||||
|
||||
friend NS_IMETHODIMP NS_NewInternetSearchService(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
||||
@@ -404,7 +404,7 @@ InternetSearchDataSource::InternetSearchDataSource(void)
|
||||
NS_GET_IID(nsIRDFService), (nsISupports**) &gRDFService);
|
||||
PR_ASSERT(NS_SUCCEEDED(rv));
|
||||
|
||||
rv = NS_NewLoadGroup(this, getter_AddRefs(mLoadGroup));
|
||||
rv = NS_NewLoadGroup(nsnull, getter_AddRefs(mLoadGroup));
|
||||
PR_ASSERT(NS_SUCCEEDED(rv));
|
||||
|
||||
gRDFService->GetResource(kURINC_SearchEngineRoot, &kNC_SearchEngineRoot);
|
||||
@@ -487,9 +487,7 @@ InternetSearchDataSource::~InternetSearchDataSource (void)
|
||||
|
||||
NS_IF_RELEASE(mInner);
|
||||
|
||||
// XXX for the moment, leak mLoadGroup...
|
||||
// mLoadGroup = nsnull;
|
||||
|
||||
mLoadGroup = nsnull;
|
||||
categoryDataSource = nsnull;
|
||||
|
||||
if (gRDFService)
|
||||
|
||||
Reference in New Issue
Block a user