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

Bug 1282275 - Return IDecodingTask objects instead of Decoder objects from most DecoderFactory functions. r=dholbert

Browse Source
This commit is contained in:
Seth Fowler
2016-06-26 00:09:24 -07:00
parent 2d498ea090
commit a8b8626747
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
image/RasterImage.cpp
View File

@@ -1306,30 +1306,31 @@ RasterImage::Decode(const IntSize& aSize, uint32_t aFlags)
}
// Create a decoder.
RefPtr<Decoder> decoder;
RefPtr<IDecodingTask> task;
if (mAnim) {
decoder = DecoderFactory::CreateAnimationDecoder(mDecoderType, this,
mSourceBuffer, decoderFlags,
surfaceFlags);
task = DecoderFactory::CreateAnimationDecoder(mDecoderType, this,
mSourceBuffer, decoderFlags,
surfaceFlags);
} else {
decoder = DecoderFactory::CreateDecoder(mDecoderType, this, mSourceBuffer,
targetSize, decoderFlags,
surfaceFlags,
mRequestedSampleSize);
task = DecoderFactory::CreateDecoder(mDecoderType, this, mSourceBuffer,
targetSize, decoderFlags,
surfaceFlags,
mRequestedSampleSize);
}
// Make sure DecoderFactory was able to create a decoder successfully.
if (!decoder) {
if (!task) {
return NS_ERROR_FAILURE;
}
// Add a placeholder for the first frame to the SurfaceCache so we won't
// trigger any more decoders with the same parameters.
SurfaceKey surfaceKey =
RasterSurfaceKey(aSize,
task->GetDecoder()->GetSurfaceFlags(),
/* aFrameNum = */ 0);
InsertOutcome outcome =
SurfaceCache::InsertPlaceholder(ImageKey(this),
RasterSurfaceKey(aSize,
decoder->GetSurfaceFlags(),
/* aFrameNum = */ 0));
SurfaceCache::InsertPlaceholder(ImageKey(this), surfaceKey);
if (outcome != InsertOutcome::SUCCESS) {
return NS_ERROR_FAILURE;
}
@@ -1337,7 +1338,6 @@ RasterImage::Decode(const IntSize& aSize, uint32_t aFlags)
mDecodeCount++;
// We're ready to decode; start the decoder.
RefPtr<IDecodingTask> task = new DecodingTask(WrapNotNull(decoder));
LaunchDecodingTask(task, this, aFlags, mHasSourceData);
return NS_OK;
}
@@ -1352,17 +1352,16 @@ RasterImage::DecodeMetadata(uint32_t aFlags)
MOZ_ASSERT(!mHasSize, "Should not do unnecessary metadata decodes");
// Create a decoder.
RefPtr<Decoder> decoder =
RefPtr<IDecodingTask> task =
DecoderFactory::CreateMetadataDecoder(mDecoderType, this, mSourceBuffer,
mRequestedSampleSize);
// Make sure DecoderFactory was able to create a decoder successfully.
if (!decoder) {
if (!task) {
return NS_ERROR_FAILURE;
}
// We're ready to decode; start the decoder.
RefPtr<IDecodingTask> task = new MetadataDecodingTask(WrapNotNull(decoder));
LaunchDecodingTask(task, this, aFlags, mHasSourceData);
return NS_OK;
}