Bug 1275720 - Remove unused input size argument to SurfacePipeFactory::MakePipe(). r=njn
authorSeth Fowler <mark.seth.fowler@gmail.com>
Thu, 26 May 2016 00:19:04 -0700
changeset 299161 354813df8073e8afa0bbff61eb71606dc96290d7
parent 299160 1f5902db90a7f9be77ee5938861b2067874fcdc7
child 299162 095bfc5ca5e7df28e00943a9f1c0cf25998db101
push idunknown
push userunknown
push dateunknown
reviewersnjn
bugs1275720
milestone49.0a1
Bug 1275720 - Remove unused input size argument to SurfacePipeFactory::MakePipe(). r=njn
image/SurfacePipeFactory.h
--- a/image/SurfacePipeFactory.h
+++ b/image/SurfacePipeFactory.h
@@ -110,44 +110,40 @@ public:
     SurfaceConfig surfaceConfig { aDecoder, aFrameNum, aOutputSize,
                                   aFormat, flipVertically };
 
     Maybe<SurfacePipe> pipe;
 
     if (downscale) {
       if (removeFrameRect) {
         if (deinterlace) {
-          pipe = MakePipe(aFrameRect.Size(), deinterlacingConfig,
-                          removeFrameRectConfig, downscalingConfig,
-                          surfaceConfig);
+          pipe = MakePipe(deinterlacingConfig, removeFrameRectConfig,
+                          downscalingConfig, surfaceConfig);
         } else {  // (deinterlace is false)
-          pipe = MakePipe(aFrameRect.Size(), removeFrameRectConfig,
-                          downscalingConfig, surfaceConfig);
+          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);
         }
       }
     }
 
     return pipe;
   }
 
   /**
@@ -190,29 +186,28 @@ public:
     DeinterlacingConfig<uint8_t> deinterlacingConfig { progressiveDisplay };
     PalettedSurfaceConfig palettedSurfaceConfig { aDecoder, aFrameNum, aInputSize,
                                                   aFrameRect, aFormat, aPaletteDepth,
                                                   flipVertically };
 
     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;
   }
 
 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...);
     if (NS_FAILED(rv)) {
       return Nothing();
     }
 
     return Some(SurfacePipe { Move(pipe) } );