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

Backed out changeset fb3e2fb82000 (bug 802390) for mochitest bc orange.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-11-16 16:58:11 -05:00
parent 143f3073ee
commit 7ac458881d
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
image/src/Decoder.cpp
View File

@ -100,7 +100,7 @@ Decoder::Finish()
nsCOMPtr<nsIScriptError> errorObject =
do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
if (consoleService && errorObject && HasDataError() && !HasDecoderError()) {
if (consoleService && errorObject && !HasDecoderError()) {
nsAutoString msg(NS_LITERAL_STRING("Image corrupt or truncated: ") +
NS_ConvertASCIItoUTF16(mImage.GetURIString()));
@ -114,22 +114,16 @@ Decoder::Finish()
}
}
bool usable = true;
if (HasDataError() && !HasDecoderError()) {
// If we only have a data error, we're usable if we have at least one frame.
if (mImage.GetNumFrames() == 0) {
usable = false;
}
}
// If we only have a data error, see if things are worth salvaging
bool salvage = !HasDecoderError() && mImage.GetNumFrames();
// If we're usable, do exactly what we should have when the decoder
// completed.
if (usable) {
PostDecodeDone();
} else {
if (mObserver) {
mObserver->OnStopDecode(NS_ERROR_FAILURE);
}
// If we're salvaging, say we finished decoding
if (salvage)
mImage.DecodingComplete();
// Fire teardown notifications
if (mObserver) {
mObserver->OnStopDecode(salvage ? NS_OK : NS_ERROR_FAILURE);
}
}
}