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

Fix timer refcount issues in docshell, fixes bugs 39641, 39617. r=pavlov a=leaf

Browse Source
This commit is contained in:
sfraser@netscape.com
2000-05-17 20:24:43 +00:00
parent 0870c47606
commit 52c93768ba
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
docshell/base/nsDocShell.cpp
View File

@@ -2004,10 +2004,16 @@ NS_IMETHODIMP nsDocShell::RefreshURI(nsIURI *aURI, PRInt32 aDelay, PRBool aRepea
refreshTimer->mDelay = aDelay;
refreshTimer->mRepeat = aRepeat;
if (!mRefreshURIList)
{
NS_ENSURE_SUCCESS(NS_NewISupportsArray(getter_AddRefs(mRefreshURIList)),
NS_ERROR_FAILURE);
}
nsCOMPtr<nsITimer> timer = do_CreateInstance("component://netscape/timer");
NS_ENSURE_TRUE(timer, NS_ERROR_FAILURE);
mRefreshURIList.AppendElement(timer);
mRefreshURIList->AppendElement(timer); // owning timer ref
timer->Init(refreshTimer, aDelay);
return NS_OK;
@@ -2015,18 +2021,23 @@ NS_IMETHODIMP nsDocShell::RefreshURI(nsIURI *aURI, PRInt32 aDelay, PRBool aRepea
NS_IMETHODIMP nsDocShell::CancelRefreshURITimers()
{
PRInt32 n = mRefreshURIList.Count();
nsCOMPtr<nsITimer> timer;
if (!mRefreshURIList) return NS_OK;
while(n)
{
timer = dont_AddRef((nsITimer*)mRefreshURIList.ElementAt(0));
mRefreshURIList.RemoveElementAt(0);
PRUint32 n;
mRefreshURIList->Count(&n);
if(timer)
while (n)
{
nsCOMPtr<nsISupports> element;
mRefreshURIList->GetElementAt(0, getter_AddRefs(element));
nsCOMPtr<nsITimer> timer(do_QueryInterface(element));
mRefreshURIList->RemoveElementAt(0); // bye bye owning timer ref
if (timer)
timer->Cancel();
n--;
}
}
return NS_OK;
}