Pinch/Zoom Infrastructure & Plumbing CL

ui/gfx/transform.h

 // 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.
 
 #ifndef UI_GFX_TRANSFORM_H_
 #define UI_GFX_TRANSFORM_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 71 matching lines @@
   // the result to |this|.
   void RotateAboutXAxis(double degrees);
   void RotateAboutYAxis(double degrees);
   void RotateAboutZAxis(double degrees);
   void RotateAbout(const Vector3dF& axis, double degrees);
 
   // Applies the current transformation on a scaling and assigns the result
   // to |this|.
   void Scale(SkMScalar x, SkMScalar y);
   void Scale3d(SkMScalar x, SkMScalar y, SkMScalar z);
+  gfx::Vector2dF Scale() const {

[enne (OOO), 2014/01/21 19:00:06]

Scale2d?

[wjmaclean, 2014/01/21 22:37:27]

Done.

+    return gfx::Vector2dF(matrix_.get(0,0), matrix_.get(1,1));
+  }
 
   // Applies the current transformation on a translation and assigns the result
   // to |this|.
   void Translate(SkMScalar x, SkMScalar y);
   void Translate3d(SkMScalar x, SkMScalar y, SkMScalar z);
 
   // Applies the current transformation on a skew and assigns the result
   // to |this|.
   void SkewX(double angle_x);
   void SkewY(double angle_y);
@@ skipping 27 matching lines @@
     if (!IsScaleOrTranslation())
       return false;
     return matrix_.get(0, 0) > 0.0 && matrix_.get(1, 1) > 0.0 &&
            matrix_.get(2, 2) > 0.0;
   }
 
   // Returns true if the matrix is either identity or pure, non-fractional
   // translation.
   bool IsIdentityOrIntegerTranslation() const;
 
+  // Returns true if the matrix had only scaling components.
+  bool IsScale() const {

[enne (OOO), 2014/01/21 19:00:06]

Scale2d?

[wjmaclean, 2014/01/21 22:37:27]

Done.

+    return !(matrix_.getType() & ~SkMatrix44::kScale_Mask);
+  }
+
   // Returns true if the matrix is has only scaling and translation components.
   bool IsScaleOrTranslation() const {
     int mask = SkMatrix44::kScale_Mask | SkMatrix44::kTranslate_Mask;
     return (matrix_.getType() & ~mask) == 0;
   }
 
   // Returns true if axis-aligned 2d rects will remain axis-aligned after being
   // transformed by this matrix.
   bool Preserves2dAxisAlignment() const;
 
@@ skipping 107 matching lines @@
                               Point3F* point) const;
 
   SkMatrix44 matrix_;
 
   // copy/assign are allowed.
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_TRANSFORM_H_