diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-21 16:28:53 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-21 16:28:53 +0100 |
| commit | a3da925495ab64a3baa69aac4ae35d848a865616 (patch) | |
| tree | b91d7275cb8d80b7465425e614c823c06dfca100 /image/SurfacePipe.cpp | |
| parent | 6a9c2be4eac174c1b44ffb0ff16fd32fca92aa18 (diff) | |
| parent | 25f4c75d68629a26cbb5433975027cd691a18dd7 (diff) | |
| download | UXP-a3da925495ab64a3baa69aac4ae35d848a865616.tar UXP-a3da925495ab64a3baa69aac4ae35d848a865616.tar.gz UXP-a3da925495ab64a3baa69aac4ae35d848a865616.tar.lz UXP-a3da925495ab64a3baa69aac4ae35d848a865616.tar.xz UXP-a3da925495ab64a3baa69aac4ae35d848a865616.zip | |
Merge branch 'webp-update'
Diffstat (limited to 'image/SurfacePipe.cpp')
| -rw-r--r-- | image/SurfacePipe.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/image/SurfacePipe.cpp b/image/SurfacePipe.cpp index 5c306144a..882315112 100644 --- a/image/SurfacePipe.cpp +++ b/image/SurfacePipe.cpp @@ -104,10 +104,11 @@ SurfaceSink::Configure(const SurfaceConfig& aConfig) // XXX(seth): Once every Decoder subclass uses SurfacePipe, we probably want // to allocate the frame directly here and get rid of Decoder::AllocateFrame // altogether. - nsresult rv = aConfig.mDecoder->AllocateFrame(aConfig.mFrameNum, - surfaceSize, + nsresult rv = aConfig.mDecoder->AllocateFrame(surfaceSize, frameRect, - aConfig.mFormat); + aConfig.mFormat, + /* aPaletteDepth */ 0, + aConfig.mAnimParams); if (NS_FAILED(rv)) { return rv; } @@ -154,11 +155,11 @@ PalettedSurfaceSink::Configure(const PalettedSurfaceConfig& aConfig) // XXX(seth): Once every Decoder subclass uses SurfacePipe, we probably want // to allocate the frame directly here and get rid of Decoder::AllocateFrame // altogether. - nsresult rv = aConfig.mDecoder->AllocateFrame(aConfig.mFrameNum, - aConfig.mOutputSize, + nsresult rv = aConfig.mDecoder->AllocateFrame(aConfig.mOutputSize, aConfig.mFrameRect, aConfig.mFormat, - aConfig.mPaletteDepth); + aConfig.mPaletteDepth, + aConfig.mAnimParams); if (NS_FAILED(rv)) { return rv; } |