Bug 984390 - Stop using gfxPoint in SVGMarkerElement. r=me
authorJonathan Watt <jwatt@jwatt.org>
Tue, 18 Mar 2014 10:41:35 +0800
changeset 173989 e810eae23356526e8879ddada26424fafe12d1d8
parent 173988 59025ca245caca1cc042ae2e2d8cec16181d451d
child 173990 341c371eb41b95ab5f85afb4eca8e5a7b21aad76
push id41159
push userjwatt@jwatt.org
push dateTue, 18 Mar 2014 02:42:26 +0000
treeherdermozilla-inbound@341c371eb41b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs984390
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 984390 - Stop using gfxPoint in SVGMarkerElement. r=me
content/svg/content/src/SVGMarkerElement.cpp
--- a/content/svg/content/src/SVGMarkerElement.cpp
+++ b/content/svg/content/src/SVGMarkerElement.cpp
@@ -296,29 +296,29 @@ SVGMarkerElement::GetPreserveAspectRatio
 //----------------------------------------------------------------------
 // public helpers
 
 gfx::Matrix
 SVGMarkerElement::GetMarkerTransform(float aStrokeWidth,
                                      float aX, float aY, float aAutoAngle,
                                      bool aIsStart)
 {
-  gfxFloat scale = mEnumAttributes[MARKERUNITS].GetAnimValue() ==
-                     SVG_MARKERUNITS_STROKEWIDTH ? aStrokeWidth : 1.0;
+  float scale = mEnumAttributes[MARKERUNITS].GetAnimValue() ==
+                     SVG_MARKERUNITS_STROKEWIDTH ? aStrokeWidth : 1.0f;
 
-  gfxFloat angle;
+  float angle;
   switch (mOrientType.GetAnimValueInternal()) {
     case SVG_MARKER_ORIENT_AUTO:
       angle = aAutoAngle;
       break;
     case SVG_MARKER_ORIENT_AUTO_START_REVERSE:
-      angle = aAutoAngle + (aIsStart ? M_PI : 0.0);
+      angle = aAutoAngle + (aIsStart ? M_PI : 0.0f);
       break;
     default: // SVG_MARKER_ORIENT_ANGLE
-      angle = mAngleAttributes[ORIENT].GetAnimValue() * M_PI / 180.0;
+      angle = mAngleAttributes[ORIENT].GetAnimValue() * M_PI / 180.0f;
       break;
   }
 
   return gfx::Matrix(cos(angle) * scale,   sin(angle) * scale,
                      -sin(angle) * scale,  cos(angle) * scale,
                      aX,                    aY);
 }