Bug 1082483, part 3 - Remove the temporary Matrix4x4::Translate/Scale methods. r=Bas
authorJonathan Watt <jwatt@jwatt.org>
Thu, 16 Oct 2014 10:51:13 +0100
changeset 210700 145557a8efdfde4ceca360980ae91f799c9527d2
parent 210699 0f5c20e2b2c2275e7623e6eb8a7af17b0f3428a3
child 210701 bb81f8c944ea9c7beb57617d87166802bd073eb1
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersBas
bugs1082483
milestone36.0a1
Bug 1082483, part 3 - Remove the temporary Matrix4x4::Translate/Scale methods. r=Bas
gfx/2d/Matrix.h
--- a/gfx/2d/Matrix.h
+++ b/gfx/2d/Matrix.h
@@ -562,20 +562,16 @@ public:
   {
     _41 += aX * _11 + aY * _21 + aZ * _31;
     _42 += aX * _12 + aY * _22 + aZ * _32;
     _43 += aX * _13 + aY * _23 + aZ * _33;
     _44 += aX * _14 + aY * _24 + aZ * _34;
 
     return *this;
   }
-  Matrix4x4 &Translate(Float aX, Float aY, Float aZ)
-  {
-    return PreTranslate(aX, aY, aZ);
-  }
 
   /**
    * Similar to PreTranslate, but the translation is applied -after- this
    * matrix's existing transformation instead of before it.
    *
    * This method is generally less used than PreTranslate since typically code
    * wants to adjust an existing user space to device space matrix to create a
    * transform to device space from a -new- user space (translated from the
@@ -622,20 +618,16 @@ public:
     _22 *= aY;
     _23 *= aY;
     _31 *= aZ;
     _32 *= aZ;
     _33 *= aZ;
 
     return *this;
   }
-  Matrix4x4 &Scale(Float aX, Float aY, Float aZ)
-  {
-    return PreScale(aX, aY, aZ);
-  }
 
   /**
    * Similar to PostTranslate, but applies a scale instead of a translation.
    */
   Matrix4x4 &PostScale(Float aScaleX, Float aScaleY, Float aScaleZ)
   {
     _11 *= aScaleX;
     _21 *= aScaleX;