Apply skew on both axes together rather than sequentially on Compositor thread

cc/animation/transform_operations_unittest.cc

 // Copyright 2013 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.
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/test/geometry_test_utils.h"
@@ skipping 191 matching lines @@
   expected.Scale3d(x, y, z);
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected, operations.Apply());
 }
 
 TEST(TransformOperationTest, ApplySkew) {
   SkMScalar x = 1;
   SkMScalar y = 2;
   TransformOperations operations;
   operations.AppendSkew(x, y);
   gfx::Transform expected;
-  expected.SkewX(x);
-  expected.SkewY(y);
+  expected.Skew(x, y);
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected, operations.Apply());
 }
 
 TEST(TransformOperationTest, ApplyPerspective) {
   SkMScalar depth = 800;
   TransformOperations operations;
   operations.AppendPerspective(depth);
   gfx::Transform expected;
   expected.ApplyPerspectiveDepth(depth);
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected, operations.Apply());
@@ skipping 321 matching lines @@
 
 TEST(TransformOperationTest, BlendSkewFromEmpty) {
   TransformOperations empty_operation;
 
   TransformOperations operations;
   operations.AppendSkew(2, 2);
 
   SkMScalar progress = 0.5f;
 
   gfx::Transform expected;
-  expected.SkewX(1);
-  expected.SkewY(1);
+  expected.Skew(1, 1);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
                                   operations.Blend(empty_operation, progress));
 
   progress = -0.5f;
 
   expected.MakeIdentity();
-  expected.SkewX(-1);
-  expected.SkewY(-1);
+  expected.Skew(-1, -1);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
                                   operations.Blend(empty_operation, progress));
 
   progress = 1.5f;
 
   expected.MakeIdentity();
-  expected.SkewX(3);
-  expected.SkewY(3);
+  expected.Skew(3, 3);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
                                   operations.Blend(empty_operation, progress));
 }
 
 TEST(TransformOperationTest, BlendPerspectiveFromIdentity) {
   ScopedVector<TransformOperations> identity_operations;
   GetIdentityOperations(&identity_operations);
 
   for (size_t i = 0; i < identity_operations.size(); ++i) {
@@ skipping 66 matching lines @@
 
 TEST(TransformOperationTest, BlendSkewToEmpty) {
   TransformOperations empty_operation;
 
   TransformOperations operations;
   operations.AppendSkew(2, 2);
 
   SkMScalar progress = 0.5f;
 
   gfx::Transform expected;
-  expected.SkewX(1);
-  expected.SkewY(1);
+  expected.Skew(1, 1);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected,
                                   empty_operation.Blend(operations, progress));
 }
 
 TEST(TransformOperationTest, BlendPerspectiveToIdentity) {
   ScopedVector<TransformOperations> identity_operations;
   GetIdentityOperations(&identity_operations);
 
   for (size_t i = 0; i < identity_operations.size(); ++i) {
@@ skipping 795 matching lines @@
 
   // Scale + Perspective can't.
   TransformOperations operations11;
   operations11.AppendScale(2.f, 2.f, 2.f);
   operations11.AppendPerspective(1.f);
   EXPECT_FALSE(operations11.ScaleComponent(&scale));
 }
 
 }  // namespace
 }  // namespace cc