Finish migrating cc/ from WebKit::WebTransformationMatrix to gfx::Transform

cc/transform_operations.h

Index: cc/transform_operations.h
diff --git a/cc/transform_operations.h b/cc/transform_operations.h
index f3c58388e0329ec4287ca54506326c38096c07ce..1f1547e114458f137a8b0b33cbcd85f2272ee60d 100644
--- a/cc/transform_operations.h
+++ b/cc/transform_operations.h
@@ -10,12 +10,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
 #include "cc/transform_operation.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
+#include "ui/gfx/transform.h"
 
 namespace cc {
 
 // Transform operations are a decomposed transformation matrix. It can be
-// applied to obtain a WebTransformationMatrix at any time, and can be blended
+// applied to obtain a gfx::Transform at any time, and can be blended
 // intelligently with other transform operations, so long as they represent the
 // same decomposition. For example, if we have a transform that is made up of
 // a rotation followed by skew, it can be blended intelligently with another
@@ -30,7 +30,7 @@ class CC_EXPORT TransformOperations {
   ~TransformOperations();
 
   // Returns a transformation matrix representing these transform operations.
-  WebKit::WebTransformationMatrix Apply() const;
+  gfx::Transform Apply() const;
 
   // Given another set of transform operations and a progress in the range
   // [0, 1], returns a transformation matrix representing the intermediate
@@ -39,8 +39,7 @@ class CC_EXPORT TransformOperations {
   // transforms are baked to matrices (using apply), and the matrices are
   // then decomposed and interpolated. For more information, see
   // http://www.w3.org/TR/2011/WD-css3-2d-transforms-20111215/#matrix-decomposition.
-  WebKit::WebTransformationMatrix Blend(
-      const TransformOperations& from, double progress) const;
+  gfx::Transform Blend(const TransformOperations& from, double progress) const;
 
   // Returns true if this operation and its descendants have the same types
   // as other and its descendants.
@@ -56,13 +55,13 @@ class CC_EXPORT TransformOperations {
   void AppendScale(double x, double y, double z);
   void AppendSkew(double x, double y);
   void AppendPerspective(double depth);
-  void AppendMatrix(const WebKit::WebTransformationMatrix& matrix);
+  void AppendMatrix(const gfx::Transform& matrix);
   void AppendIdentity();
   bool IsIdentity() const;
 
  private:
   bool BlendInternal(const TransformOperations& from, double progress,
-                     WebKit::WebTransformationMatrix& result) const;
+                     gfx::Transform& result) const;

[danakj, 2013/01/25 18:04:03]

Can you make this into a * instead of a &. Chromium forbids non-const &.

[ajuma, 2013/01/25 19:28:26]

Done.

 
   std::vector<TransformOperation> operations_;
 };