Bug 846547 - Remove unused arg "aElement" from SVGContentUtils::GetVi…

…ewboxTransform() r=dholbert
Brli · Mar 3, 2013 · 3afaa62 · 3afaa62
1 parent 87ee6a7
commit 3afaa62
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/content/svg/content/src/SVGContentUtils.cpp b/content/svg/content/src/SVGContentUtils.cpp
@@ -273,22 +273,19 @@ SVGContentUtils::AngleBisect(float a1, float a2)
 }
 
 gfxMatrix
-SVGContentUtils::GetViewBoxTransform(const nsSVGElement* aElement,
-                                     float aViewportWidth, float aViewportHeight,
+SVGContentUtils::GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
                                      float aViewboxX, float aViewboxY,
                                      float aViewboxWidth, float aViewboxHeight,
                                      const SVGAnimatedPreserveAspectRatio &aPreserveAspectRatio)
 {
-  return GetViewBoxTransform(aElement,
-                             aViewportWidth, aViewportHeight,
+  return GetViewBoxTransform(aViewportWidth, aViewportHeight,
                              aViewboxX, aViewboxY,
                              aViewboxWidth, aViewboxHeight,
                              aPreserveAspectRatio.GetAnimValue());
 }
 
 gfxMatrix
-SVGContentUtils::GetViewBoxTransform(const nsSVGElement* aElement,
-                                     float aViewportWidth, float aViewportHeight,
+SVGContentUtils::GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
                                      float aViewboxX, float aViewboxY,
                                      float aViewboxWidth, float aViewboxHeight,
                                      const SVGPreserveAspectRatio &aPreserveAspectRatio)

diff --git a/content/svg/content/src/SVGContentUtils.h b/content/svg/content/src/SVGContentUtils.h
@@ -123,15 +123,13 @@ class SVGContentUtils
   /* Generate a viewbox to viewport tranformation matrix */
 
   static gfxMatrix
-  GetViewBoxTransform(const nsSVGElement* aElement,
-                      float aViewportWidth, float aViewportHeight,
+  GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
                       float aViewboxX, float aViewboxY,
                       float aViewboxWidth, float aViewboxHeight,
                       const SVGAnimatedPreserveAspectRatio &aPreserveAspectRatio);
 
   static gfxMatrix
-  GetViewBoxTransform(const nsSVGElement* aElement,
-                      float aViewportWidth, float aViewportHeight,
+  GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
                       float aViewboxX, float aViewboxY,
                       float aViewboxWidth, float aViewboxHeight,
                       const SVGPreserveAspectRatio &aPreserveAspectRatio);

diff --git a/content/svg/content/src/SVGMarkerElement.cpp b/content/svg/content/src/SVGMarkerElement.cpp
@@ -345,8 +345,7 @@ SVGMarkerElement::GetViewBoxTransform()
                       "Rendering should be disabled");
 
     gfxMatrix viewBoxTM =
-      SVGContentUtils::GetViewBoxTransform(this,
-                                           viewportWidth, viewportHeight,
+      SVGContentUtils::GetViewBoxTransform(viewportWidth, viewportHeight,
                                            viewbox.x, viewbox.y,
                                            viewbox.width, viewbox.height,
                                            mPreserveAspectRatio);

diff --git a/content/svg/content/src/SVGSVGElement.cpp b/content/svg/content/src/SVGSVGElement.cpp
@@ -667,8 +667,7 @@ SVGSVGElement::GetViewBoxTransform() const
     return gfxMatrix(0.0, 0.0, 0.0, 0.0, 0.0, 0.0); // singular
   }
 
-  return SVGContentUtils::GetViewBoxTransform(this,
-                                              viewportWidth, viewportHeight,
+  return SVGContentUtils::GetViewBoxTransform(viewportWidth, viewportHeight,
                                               viewBox.x, viewBox.y,
                                               viewBox.width, viewBox.height,
                                               GetPreserveAspectRatioWithOverride());

diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp
@@ -5648,8 +5648,7 @@ nsSVGFEImageElement::Filter(nsSVGFilterInstance *instance,
     const gfxRect& filterSubregion = aTarget->mFilterPrimitiveSubregion;
 
     gfxMatrix viewBoxTM =
-      SVGContentUtils::GetViewBoxTransform(this,
-                                           filterSubregion.Width(), filterSubregion.Height(),
+      SVGContentUtils::GetViewBoxTransform(filterSubregion.Width(), filterSubregion.Height(),
                                            0,0, nativeWidth, nativeHeight,
                                            mPreserveAspectRatio);
 

diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp
@@ -225,8 +225,7 @@ nsSVGImageFrame::GetRasterImageTransform(int32_t aNativeWidth,
   element->GetAnimatedLengthValues(&x, &y, &width, &height, nullptr);
 
   gfxMatrix viewBoxTM =
-    SVGContentUtils::GetViewBoxTransform(element,
-                                         width, height,
+    SVGContentUtils::GetViewBoxTransform(width, height,
                                          0, 0, aNativeWidth, aNativeHeight,
                                          element->mPreserveAspectRatio);
 

diff --git a/layout/svg/nsSVGPatternFrame.cpp b/layout/svg/nsSVGPatternFrame.cpp
@@ -663,7 +663,6 @@ nsSVGPatternFrame::ConstructCTM(const nsSVGViewBox& aViewBox,
   }
 
   gfxMatrix tm = SVGContentUtils::GetViewBoxTransform(
-    static_cast<SVGPatternElement*>(mContent),
     viewportWidth, viewportHeight,
     viewBoxRect.x, viewBoxRect.y,
     viewBoxRect.width, viewBoxRect.height,