Refactor TransformPoint{,Reverse}.

ui/gfx/transform.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/gfx/transform.h"
 
 #include <cmath>
@@ skipping 351 matching lines @@
 
 Vector2dF Transform::To2dTranslation() const {
   DCHECK(IsIdentityOrTranslation());
   // Ensure that this translation is truly 2d.
   const SkMScalar translate_z = matrix_.get(2, 3);
   DCHECK_EQ(0.f, translate_z);
   return gfx::Vector2dF(SkMScalarToFloat(matrix_.get(0, 3)),
                         SkMScalarToFloat(matrix_.get(1, 3)));
 }
 
-void Transform::TransformPoint(Point& point) const {
+void Transform::TransformPoint(Point* point) const {
+  DCHECK(point);
   TransformPointInternal(matrix_, point);
 }
 
-void Transform::TransformPoint(Point3F& point) const {
+void Transform::TransformPoint(Point3F* point) const {
+  DCHECK(point);
   TransformPointInternal(matrix_, point);
 }
 
-bool Transform::TransformPointReverse(Point& point) const {
+bool Transform::TransformPointReverse(Point* point) const {
+  DCHECK(point);
+
   // TODO(sad): Try to avoid trying to invert the matrix.
   SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor);
   if (!matrix_.invert(&inverse))
     return false;
 
   TransformPointInternal(inverse, point);
   return true;
 }
 
-bool Transform::TransformPointReverse(Point3F& point) const {
+bool Transform::TransformPointReverse(Point3F* point) const {
+  DCHECK(point);
+
   // TODO(sad): Try to avoid trying to invert the matrix.
   SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor);
   if (!matrix_.invert(&inverse))
     return false;
 
   TransformPointInternal(inverse, point);
   return true;
 }
 
 void Transform::TransformRect(RectF* rect) const {
@@ skipping 29 matching lines @@
     return false;
 
   if (!BlendDecomposedTransforms(&to_decomp, to_decomp, from_decomp, progress))
     return false;
 
   matrix_ = ComposeTransform(to_decomp).matrix();
   return true;
 }
 
 void Transform::TransformPointInternal(const SkMatrix44& xform,
-                                       Point3F& point) const {
+                                       Point3F* point) const {
   if (xform.isIdentity())
     return;
 
-  SkMScalar p[4] = {SkFloatToMScalar(point.x()), SkFloatToMScalar(point.y()),
-                    SkFloatToMScalar(point.z()), 1};
+  SkMScalar p[4] = {SkFloatToMScalar(point->x()), SkFloatToMScalar(point->y()),
+                    SkFloatToMScalar(point->z()), 1};
 
   xform.mapMScalars(p);
 
   if (p[3] != 1 && abs(p[3]) > 0) {
-    point.SetPoint(p[0] / p[3], p[1] / p[3], p[2]/ p[3]);
+    point->SetPoint(p[0] / p[3], p[1] / p[3], p[2]/ p[3]);
   } else {
-    point.SetPoint(p[0], p[1], p[2]);
+    point->SetPoint(p[0], p[1], p[2]);
   }
 }
 
 void Transform::TransformPointInternal(const SkMatrix44& xform,
-                                       Point& point) const {
+                                       Point* point) const {
   if (xform.isIdentity())
     return;
 
-  SkMScalar p[4] = {SkFloatToMScalar(point.x()), SkFloatToMScalar(point.y()), 0,
-                    1};
+  SkMScalar p[4] = {SkFloatToMScalar(point->x()), SkFloatToMScalar(point->y()),
+                    0, 1};
 
   xform.mapMScalars(p);
 
-  point.SetPoint(ToRoundedInt(p[0]), ToRoundedInt(p[1]));
+  point->SetPoint(ToRoundedInt(p[0]), ToRoundedInt(p[1]));
 }
 
 std::string Transform::ToString() const {
   return base::StringPrintf(
       "[ %+0.4f %+0.4f %+0.4f %+0.4f  \n"
       "  %+0.4f %+0.4f %+0.4f %+0.4f  \n"
       "  %+0.4f %+0.4f %+0.4f %+0.4f  \n"
       "  %+0.4f %+0.4f %+0.4f %+0.4f ]\n",
       matrix_.get(0, 0),
       matrix_.get(0, 1),
       matrix_.get(0, 2),
       matrix_.get(0, 3),
       matrix_.get(1, 0),
       matrix_.get(1, 1),
       matrix_.get(1, 2),
       matrix_.get(1, 3),
       matrix_.get(2, 0),
       matrix_.get(2, 1),
       matrix_.get(2, 2),
       matrix_.get(2, 3),
       matrix_.get(3, 0),
       matrix_.get(3, 1),
       matrix_.get(3, 2),
       matrix_.get(3, 3));
 }
 
 }  // namespace gfx