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 1207355 (Part 7) - Only trigger intrinsic size decode in FinalizeDecoder() if StartDecoding() was called. r=tn

Browse Source
This commit is contained in:
Seth Fowler 2015-10-29 16:37:42 -07:00
parent 673522f3d2
commit 6596bddd57
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
image/RasterImage.cpp
View File

@ -319,6 +319,9 @@ RasterImage::LookupFrame(uint32_t aFrameNum,
IntSize requestedSize = CanDownscaleDuringDecode(aSize, aFlags) IntSize requestedSize = CanDownscaleDuringDecode(aSize, aFlags)
? aSize : mSize; ? aSize : mSize;
if (requestedSize.IsEmpty()) {
return DrawableFrameRef(); // Can't decode to a surface of zero size.
}
LookupResult result = LookupFrameInternal(aFrameNum, requestedSize, aFlags); LookupResult result = LookupFrameInternal(aFrameNum, requestedSize, aFlags);
@ -1175,6 +1178,15 @@ RasterImage::RequestDecode()
NS_IMETHODIMP NS_IMETHODIMP
RasterImage::StartDecoding() RasterImage::StartDecoding()
{ {
if (mError) {
return NS_ERROR_FAILURE;
}
if (!mHasSize) {
mWantFullDecode = true;
return NS_OK;
}
return RequestDecodeForSize(mSize, FLAG_SYNC_DECODE_IF_FAST); return RequestDecodeForSize(mSize, FLAG_SYNC_DECODE_IF_FAST);
} }
@ -1188,7 +1200,6 @@ RasterImage::RequestDecodeForSize(const IntSize& aSize, uint32_t aFlags)
} }
if (!mHasSize) { if (!mHasSize) {
mWantFullDecode = true;
return NS_OK; return NS_OK;
} }