wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 952354. Don't worry about premult alpha flags if the frame is opaque when calling GetFrame and CopyFrame. r=seth

Browse Source
This commit is contained in:
Timothy Nikkel 2014-03-04 22:48:48 -06:00
parent 0ff448bbbf
commit 87283ff654
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
image/src/RasterImage.cpp
View File

@ -835,7 +835,7 @@ RasterImage::CopyFrame(uint32_t aWhichFrame,
nsresult rv;
if (!ApplyDecodeFlags(aFlags))
if (!ApplyDecodeFlags(aFlags, aWhichFrame))
return NS_ERROR_NOT_AVAILABLE;
// If requested, synchronously flush any data we have lying around to the decoder
@ -896,7 +896,7 @@ RasterImage::GetFrame(uint32_t aWhichFrame,
if (mInDecoder && (aFlags & imgIContainer::FLAG_SYNC_DECODE))
return nullptr;
if (!ApplyDecodeFlags(aFlags))
if (!ApplyDecodeFlags(aFlags, aWhichFrame))
return nullptr;
// If the caller requested a synchronous decode, do it
@ -1183,12 +1183,23 @@ RasterImage::InternalAddFrame(uint32_t framenum,
}
bool
RasterImage::ApplyDecodeFlags(uint32_t aNewFlags)
RasterImage::ApplyDecodeFlags(uint32_t aNewFlags, uint32_t aWhichFrame)
{
if (mFrameDecodeFlags == (aNewFlags & DECODE_FLAGS_MASK))
return true; // Not asking very much of us here.
if (mDecoded) {
// If the requested frame is opaque and the current and new decode flags
// only differ in the premultiply alpha bit then we can use the existing
// frame, we don't need to discard and re-decode.
uint32_t currentNonAlphaFlags =
(mFrameDecodeFlags & DECODE_FLAGS_MASK) & ~FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
uint32_t newNonAlphaFlags =
(aNewFlags & DECODE_FLAGS_MASK) & ~FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
if (currentNonAlphaFlags == newNonAlphaFlags && FrameIsOpaque(aWhichFrame)) {
return true;
}
// if we can't discard, then we're screwed; we have no way
// to re-decode. Similarly if we aren't allowed to do a sync
// decode.

2
image/src/RasterImage.h
View File

@ -590,7 +590,7 @@ private:
nsresult DoImageDataComplete();
bool ApplyDecodeFlags(uint32_t aNewFlags);
bool ApplyDecodeFlags(uint32_t aNewFlags, uint32_t aWhichFrame);
already_AddRefed<layers::Image> GetCurrentImage();
void UpdateImageContainer();