Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1275720 - Remove unused input size argument to SurfacePipeFactory::MakePipe(). r=njn

Browse Source 
--HG--
extra : rebase_source : c8762b43d48e3335aed7887775eec3f8ee1690fa
This commit is contained in:
Seth Fowler 2016-05-26 00:19:04 -07:00
parent b86aaf9dc4
commit 095c978f47
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
image/SurfacePipeFactory.h
View File

@ -115,34 +115,30 @@ public:
if (downscale) {
if (removeFrameRect) {
if (deinterlace) {
pipe = MakePipe(aFrameRect.Size(), deinterlacingConfig,
removeFrameRectConfig, downscalingConfig,
surfaceConfig);
} else { // (deinterlace is false)
pipe = MakePipe(aFrameRect.Size(), removeFrameRectConfig,
pipe = MakePipe(deinterlacingConfig, removeFrameRectConfig,
downscalingConfig, surfaceConfig);
} else { // (deinterlace is false)
pipe = MakePipe(removeFrameRectConfig, downscalingConfig, surfaceConfig);
}
} else { // (removeFrameRect is false)
if (deinterlace) {
pipe = MakePipe(aInputSize, deinterlacingConfig,
downscalingConfig, surfaceConfig);
pipe = MakePipe(deinterlacingConfig, downscalingConfig, surfaceConfig);
} else { // (deinterlace is false)
pipe = MakePipe(aInputSize, downscalingConfig, surfaceConfig);
pipe = MakePipe(downscalingConfig, surfaceConfig);
}
}
} else { // (downscale is false)
if (removeFrameRect) {
if (deinterlace) {
pipe = MakePipe(aFrameRect.Size(), deinterlacingConfig,
removeFrameRectConfig, surfaceConfig);
pipe = MakePipe(deinterlacingConfig, removeFrameRectConfig, surfaceConfig);
} else { // (deinterlace is false)
pipe = MakePipe(aFrameRect.Size(), removeFrameRectConfig, surfaceConfig);
pipe = MakePipe(removeFrameRectConfig, surfaceConfig);
}
} else { // (removeFrameRect is false)
if (deinterlace) {
pipe = MakePipe(aInputSize, deinterlacingConfig, surfaceConfig);
pipe = MakePipe(deinterlacingConfig, surfaceConfig);
} else { // (deinterlace is false)
pipe = MakePipe(aInputSize, surfaceConfig);
pipe = MakePipe(surfaceConfig);
}
}
}
@ -195,10 +191,9 @@ public:
Maybe<SurfacePipe> pipe;
if (deinterlace) {
pipe = MakePipe(aFrameRect.Size(), deinterlacingConfig,
palettedSurfaceConfig);
pipe = MakePipe(deinterlacingConfig, palettedSurfaceConfig);
} else {
pipe = MakePipe(aFrameRect.Size(), palettedSurfaceConfig);
pipe = MakePipe(palettedSurfaceConfig);
}
return pipe;
@ -207,7 +202,7 @@ public:
private:
template <typename... Configs>
static Maybe<SurfacePipe>
MakePipe(const nsIntSize& aInputSize, Configs... aConfigs)
MakePipe(Configs... aConfigs)
{
auto pipe = MakeUnique<typename detail::FilterPipeline<Configs...>::Type>();
nsresult rv = pipe->Configure(aConfigs...);