corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1291071 (Part 1) - Pass ImageMetadata explicitly to FinalizeDecoder. r=edwin

Browse Source
This commit is contained in:
Seth Fowler
2016-08-02 15:43:47 -07:00
parent 0b15273908
commit fd4149ef5a
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
image/IDecodingTask.cpp
View File

@@ -63,10 +63,13 @@ IDecodingTask::NotifyDecodeComplete(NotNull<RasterImage*> aImage,
MOZ_ASSERT(aDecoder->HasError() || !aDecoder->InFrame(),
"Decode complete in the middle of a frame?");
// Capture the decoder's state.
ImageMetadata metadata = aDecoder->GetImageMetadata();
// Synchronously notify if we can.
if (NS_IsMainThread() &&
!(aDecoder->GetDecoderFlags() & DecoderFlags::ASYNC_NOTIFY)) {
aImage->FinalizeDecoder(aDecoder);
aImage->FinalizeDecoder(aDecoder, metadata);
return;
}
@@ -74,7 +77,7 @@ IDecodingTask::NotifyDecodeComplete(NotNull<RasterImage*> aImage,
NotNull<RefPtr<RasterImage>> image = aImage;
NotNull<RefPtr<Decoder>> decoder = aDecoder;
NS_DispatchToMainThread(NS_NewRunnableFunction([=]() -> void {
image->FinalizeDecoder(decoder.get());
image->FinalizeDecoder(decoder.get(), metadata);
}));
}