зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1098108 (Part 1) - Don't overwrite nsICODecoder's progress with the contained decoder's progress. r=tn
This commit is contained in:
Родитель
03cc795af0
Коммит
14f1a742fb
|
@ -83,7 +83,7 @@ nsICODecoder::FinishInternal()
|
|||
if (mContainedDecoder) {
|
||||
mContainedDecoder->FinishSharedDecoder();
|
||||
mDecodeDone = mContainedDecoder->GetDecodeDone();
|
||||
mProgress = mContainedDecoder->GetProgress();
|
||||
mProgress |= mContainedDecoder->GetProgress();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -587,7 +587,7 @@ nsICODecoder::WriteToContainedDecoder(const char* aBuffer, uint32_t aCount,
|
|||
DecodeStrategy aStrategy)
|
||||
{
|
||||
mContainedDecoder->Write(aBuffer, aCount, aStrategy);
|
||||
mProgress = mContainedDecoder->GetProgress();
|
||||
mProgress |= mContainedDecoder->GetProgress();
|
||||
if (mContainedDecoder->HasDataError()) {
|
||||
mDataError = mContainedDecoder->HasDataError();
|
||||
}
|
||||
|
@ -632,7 +632,7 @@ nsICODecoder::AllocateFrame()
|
|||
if (mContainedDecoder) {
|
||||
nsresult rv = mContainedDecoder->AllocateFrame();
|
||||
mCurrentFrame = mContainedDecoder->GetCurrentFrame();
|
||||
mProgress = mContainedDecoder->GetProgress();
|
||||
mProgress |= mContainedDecoder->GetProgress();
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче