Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 418791 - "Don't try to discard image data when the image is animating" (Don't start the timer when image is animating) [p=alfredkayser@gmail.com (Alfred Kayser) r=stuart a=blocking1.9+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-09 12:58:40 -07:00
parent ca72c859b7
commit 6f1799c430
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/libpr0n/src/imgContainer.cpp
View File

@ -652,6 +652,8 @@ NS_IMETHODIMP imgContainer::RestoreDataDone (void)
/* void notify(in nsITimer timer); */ /* void notify(in nsITimer timer); */
NS_IMETHODIMP imgContainer::Notify(nsITimer *timer) NS_IMETHODIMP imgContainer::Notify(nsITimer *timer)
{ {
// Note that as long as the image is animated, it will not be discarded,
// so this should never happen...
nsresult rv = RestoreDiscardedData(); nsresult rv = RestoreDiscardedData();
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -661,7 +663,7 @@ NS_IMETHODIMP imgContainer::Notify(nsITimer *timer)
NS_ASSERTION(mAnim->timer == timer, NS_ASSERTION(mAnim->timer == timer,
"imgContainer::Notify() called with incorrect timer"); "imgContainer::Notify() called with incorrect timer");
if (!(mAnim->animating) || !(mAnim->timer)) if (!mAnim->animating || !mAnim->timer)
return NS_OK; return NS_OK;
nsCOMPtr<imgIContainerObserver> observer(do_QueryReferent(mObserver)); nsCOMPtr<imgIContainerObserver> observer(do_QueryReferent(mObserver));
@ -1305,15 +1307,23 @@ imgContainer::sDiscardTimerCallback(nsITimer *aTimer, void *aClosure)
nsresult nsresult
imgContainer::ResetDiscardTimer (void) imgContainer::ResetDiscardTimer (void)
{ {
if (!DiscardingEnabled()) if (!mRestoreDataDone)
return NS_OK;
if (mDiscardTimer) {
/* Cancel current timer */
nsresult rv = mDiscardTimer->Cancel();
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
mDiscardTimer = nsnull;
}
/* Don't activate timer when we are animating... */
if (mAnim && mAnim->animating)
return NS_OK; return NS_OK;
if (!mDiscardTimer) { if (!mDiscardTimer) {
mDiscardTimer = do_CreateInstance("@mozilla.org/timer;1"); mDiscardTimer = do_CreateInstance("@mozilla.org/timer;1");
NS_ENSURE_TRUE(mDiscardTimer, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(mDiscardTimer, NS_ERROR_OUT_OF_MEMORY);
} else {
nsresult rv = mDiscardTimer->Cancel();
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
} }
return mDiscardTimer->InitWithFuncCallback(sDiscardTimerCallback, return mDiscardTimer->InitWithFuncCallback(sDiscardTimerCallback,