Bug 619967 - Resolve percentage filter primitive attributes correctly. r=roc

layout/svg/base/src/nsSVGFilterInstance.cpp

@@ -43,11 +43,6 @@
 #include "nsLayoutUtils.h"
 #include "gfxUtils.h"
 
-static double Square(double aX)
-{
-  return aX*aX;
-}
-
 float
 nsSVGFilterInstance::GetPrimitiveNumber(PRUint8 aCtxType, float aValue) const
 {
@@ -69,9 +64,9 @@ nsSVGFilterInstance::GetPrimitiveNumber(PRUint8 aCtxType, float aValue) const
     return value * mFilterSpaceSize.height / mFilterRect.Height();
   case nsSVGUtils::XY:
   default:
-    return value *
+    return value * nsSVGUtils::ComputeNormalizedHypotenuse(
-      sqrt(Square(mFilterSpaceSize.width) + Square(mFilterSpaceSize.height)) /
+                     mFilterSpaceSize.width / mFilterRect.Width(),
-      sqrt(Square(mFilterRect.Width()) + Square(mFilterRect.Height()));
+                     mFilterSpaceSize.height / mFilterRect.Height());
   }
 }