Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 969406 - Make ImageLoader force painting on FRAME_COMPLETE but not FRAME_CHANGED. r=mattwoodrow

Browse Source
This commit is contained in:
Seth Fowler 2014-11-07 15:40:12 -08:00
parent 7faf79f786
commit 819193bb68
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/style/ImageLoader.cpp
View File

@ -350,6 +350,7 @@ void InvalidateImagesCallback(nsIFrame* aFrame,
}
aItem->Invalidate();
aFrame->SchedulePaint();
// Update ancestor rendering observers (-moz-element etc)
nsIFrame *f = aFrame;
@ -360,7 +361,7 @@ void InvalidateImagesCallback(nsIFrame* aFrame,
}
void
ImageLoader::DoRedraw(FrameSet* aFrameSet)
ImageLoader::DoRedraw(FrameSet* aFrameSet, bool aForcePaint)
{
NS_ASSERTION(aFrameSet, "Must have a frame set");
NS_ASSERTION(mDocument, "Should have returned earlier!");
@ -377,7 +378,9 @@ ImageLoader::DoRedraw(FrameSet* aFrameSet)
frame->InvalidateFrame();
} else {
FrameLayerBuilder::IterateRetainedDataFor(frame, InvalidateImagesCallback);
frame->SchedulePaint();
if (aForcePaint) {
frame->SchedulePaint();
}
}
}
}
@ -466,7 +469,10 @@ ImageLoader::OnStopFrame(imgIRequest *aRequest)
NS_ASSERTION(frameSet, "This should never be null!");
DoRedraw(frameSet);
// Since we just finished decoding a frame, we always want to paint, in case
// we're now able to paint an image that we couldn't paint before (and hence
// that we don't have retained data for).
DoRedraw(frameSet, /* aForcePaint = */ true);
return NS_OK;
}
@ -485,7 +491,7 @@ ImageLoader::FrameChanged(imgIRequest *aRequest)
NS_ASSERTION(frameSet, "This should never be null!");
DoRedraw(frameSet);
DoRedraw(frameSet, /* aForcePaint = */ false);
return NS_OK;
}

2
layout/style/ImageLoader.h
View File

@ -90,7 +90,7 @@ private:
nsPresContext* GetPresContext();
void DoRedraw(FrameSet* aFrameSet);
void DoRedraw(FrameSet* aFrameSet, bool aForcePaint);
static PLDHashOperator
SetAnimationModeEnumerator(nsISupports* aKey, FrameSet* aValue,