Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 18:31:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1106423 - Always use raw frames in DoBlend. r=tn

Browse Source
This commit is contained in:
Seth Fowler 2014-12-03 10:02:17 -08:00
parent c933256755
commit cc764fac92
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
image/src/FrameBlender.cpp
View File

@ -53,20 +53,6 @@ FrameBlender::RawGetFrame(uint32_t aFrameNum)
return frame.forget();
}
int32_t
FrameBlender::GetFrameDisposalMethod(uint32_t aFrameNum) const
{
if (!mAnim) {
NS_ASSERTION(aFrameNum == 0,
"Don't ask for a frame > 0 if we're not animated!");
aFrameNum = 0;
}
if (aFrameNum >= mFrames.Length()) {
return FrameBlender::kDisposeNotSpecified;
}
return mFrames[aFrameNum]->GetFrameDisposalMethod();
}
uint32_t
FrameBlender::GetNumFrames() const
{
@ -149,12 +135,12 @@ FrameBlender::DoBlend(nsIntRect* aDirtyRect,
uint32_t aPrevFrameIndex,
uint32_t aNextFrameIndex)
{
nsRefPtr<imgFrame> prevFrame = GetFrame(aPrevFrameIndex);
nsRefPtr<imgFrame> nextFrame = GetFrame(aNextFrameIndex);
nsRefPtr<imgFrame> prevFrame = RawGetFrame(aPrevFrameIndex);
nsRefPtr<imgFrame> nextFrame = RawGetFrame(aNextFrameIndex);
MOZ_ASSERT(prevFrame && nextFrame, "Should have frames here");
int32_t prevFrameDisposalMethod = GetFrameDisposalMethod(aPrevFrameIndex);
int32_t prevFrameDisposalMethod = prevFrame->GetFrameDisposalMethod();
if (prevFrameDisposalMethod == FrameBlender::kDisposeRestorePrevious &&
!mAnim->compositingPrevFrame) {
prevFrameDisposalMethod = FrameBlender::kDisposeClear;
@ -172,7 +158,7 @@ FrameBlender::DoBlend(nsIntRect* aDirtyRect,
prevFrameDisposalMethod = FrameBlender::kDisposeClearAll;
}
int32_t nextFrameDisposalMethod = GetFrameDisposalMethod(aNextFrameIndex);
int32_t nextFrameDisposalMethod = nextFrame->GetFrameDisposalMethod();
nsIntRect nextFrameRect = nextFrame->GetRect();
bool isFullNextFrame = (nextFrameRect.x == 0 && nextFrameRect.y == 0 &&
nextFrameRect.width == mSize.width &&

9
image/src/FrameBlender.h
View File

@ -107,15 +107,6 @@ public:
private:
/**
* Get the disposal method of the @aIndex-th frame.
*
* Note that it's not safe to use GetFrame(aIndex)->GetFrameDisposalMethod()
* instead, because the frame GetFrame() returns may be a blended frame which
* does not have the correct disposal method set.
*/
int32_t GetFrameDisposalMethod(uint32_t aIndex) const;
struct Anim
{
//! Track the last composited frame for Optimizations (See DoComposite code)