diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-21 12:57:17 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-21 12:57:17 +0100 |
commit | 622098073e132995994fac4d61e3629d08ee1801 (patch) | |
tree | a348124917c22add706fec705f3a185c1f4af567 /image/SurfacePipe.cpp | |
parent | 807acf738f63d95fbecfb9129092aaa2379889ba (diff) | |
download | UXP-622098073e132995994fac4d61e3629d08ee1801.tar UXP-622098073e132995994fac4d61e3629d08ee1801.tar.gz UXP-622098073e132995994fac4d61e3629d08ee1801.tar.lz UXP-622098073e132995994fac4d61e3629d08ee1801.tar.xz UXP-622098073e132995994fac4d61e3629d08ee1801.zip |
Bug 1462355 - Part 1b. Update Decoder and SurfacePipe plumbing to use updated imgFrame methods.
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; } |