Only create instances of WebTransformOperations using cc::TransformOperations::Create

cc/keyframed_animation_curve_unittest.cc

 // Copyright 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.
 
 #include "cc/keyframed_animation_curve.h"
 
+#include "cc/transform_operations.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 namespace {
 
@@ skipping 63 matching lines @@
     EXPECT_FLOAT_EQ(6, curve->getValue(1.5));
     EXPECT_FLOAT_EQ(6, curve->getValue(2));
     EXPECT_FLOAT_EQ(6, curve->getValue(3));
 }
 
 
 // Tests that a transform animation with one keyframe works as expected.
 TEST(KeyframedAnimationCurveTest, OneTransformKeyframe)
 {
     scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
-    WebKit::WebTransformOperations operations;
-    operations.appendTranslate(2, 0, 0);
-    curve->addKeyframe(TransformKeyframe::create(0, operations, scoped_ptr<TimingFunction>()));
+    scoped_ptr<WebKit::WebTransformOperations> operations(
+        TransformOperations::Create());
+    operations->appendTranslate(2, 0, 0);
+    curve->addKeyframe(TransformKeyframe::create(0, *operations, scoped_ptr<TimingFunction>()));
 
     expectTranslateX(2, curve->getValue(-1));
     expectTranslateX(2, curve->getValue(0));
     expectTranslateX(2, curve->getValue(0.5));
     expectTranslateX(2, curve->getValue(1));
     expectTranslateX(2, curve->getValue(2));
 }
 
 // Tests that a transform animation with two keyframes works as expected.
 TEST(KeyframedAnimationCurveTest, TwoTransformKeyframe)
 {
     scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
-    WebKit::WebTransformOperations operations1;
-    operations1.appendTranslate(2, 0, 0);
-    WebKit::WebTransformOperations operations2;
-    operations2.appendTranslate(4, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations1(
+        TransformOperations::Create());
+    operations1->appendTranslate(2, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations2(
+        TransformOperations::Create());
+    operations2->appendTranslate(4, 0, 0);
 
-    curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(0, *operations1, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(1, *operations2, scoped_ptr<TimingFunction>()));
     expectTranslateX(2, curve->getValue(-1));
     expectTranslateX(2, curve->getValue(0));
     expectTranslateX(3, curve->getValue(0.5));
     expectTranslateX(4, curve->getValue(1));
     expectTranslateX(4, curve->getValue(2));
 }
 
 // Tests that a transform animation with three keyframes works as expected.
 TEST(KeyframedAnimationCurveTest, ThreeTransformKeyframe)
 {
     scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
-    WebKit::WebTransformOperations operations1;
-    operations1.appendTranslate(2, 0, 0);
-    WebKit::WebTransformOperations operations2;
-    operations2.appendTranslate(4, 0, 0);
-    WebKit::WebTransformOperations operations3;
-    operations3.appendTranslate(8, 0, 0);
-    curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(2, operations3, scoped_ptr<TimingFunction>()));
+    scoped_ptr<WebKit::WebTransformOperations> operations1(
+        TransformOperations::Create());
+    operations1->appendTranslate(2, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations2(
+        TransformOperations::Create());
+    operations2->appendTranslate(4, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations3(
+        TransformOperations::Create());
+    operations3->appendTranslate(8, 0, 0);
+    curve->addKeyframe(TransformKeyframe::create(0, *operations1, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(1, *operations2, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(2, *operations3, scoped_ptr<TimingFunction>()));
     expectTranslateX(2, curve->getValue(-1));
     expectTranslateX(2, curve->getValue(0));
     expectTranslateX(3, curve->getValue(0.5));
     expectTranslateX(4, curve->getValue(1));
     expectTranslateX(6, curve->getValue(1.5));
     expectTranslateX(8, curve->getValue(2));
     expectTranslateX(8, curve->getValue(3));
 }
 
 // Tests that a transform animation with multiple keys at a given time works sanely.
 TEST(KeyframedAnimationCurveTest, RepeatedTransformKeyTimes)
 {
     scoped_ptr<KeyframedTransformAnimationCurve> curve(KeyframedTransformAnimationCurve::create());
     // A step function.
-    WebKit::WebTransformOperations operations1;
-    operations1.appendTranslate(4, 0, 0);
-    WebKit::WebTransformOperations operations2;
-    operations2.appendTranslate(4, 0, 0);
-    WebKit::WebTransformOperations operations3;
-    operations3.appendTranslate(6, 0, 0);
-    WebKit::WebTransformOperations operations4;
-    operations4.appendTranslate(6, 0, 0);
-    curve->addKeyframe(TransformKeyframe::create(0, operations1, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(1, operations2, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(1, operations3, scoped_ptr<TimingFunction>()));
-    curve->addKeyframe(TransformKeyframe::create(2, operations4, scoped_ptr<TimingFunction>()));
+    scoped_ptr<WebKit::WebTransformOperations> operations1(
+        TransformOperations::Create());
+    operations1->appendTranslate(4, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations2(
+        TransformOperations::Create());
+    operations2->appendTranslate(4, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations3(
+        TransformOperations::Create());
+    operations3->appendTranslate(6, 0, 0);
+    scoped_ptr<WebKit::WebTransformOperations> operations4(
+        TransformOperations::Create());
+    operations4->appendTranslate(6, 0, 0);
+    curve->addKeyframe(TransformKeyframe::create(0, *operations1, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(1, *operations2, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(1, *operations3, scoped_ptr<TimingFunction>()));
+    curve->addKeyframe(TransformKeyframe::create(2, *operations4, scoped_ptr<TimingFunction>()));
 
     expectTranslateX(4, curve->getValue(-1));
     expectTranslateX(4, curve->getValue(0));
     expectTranslateX(4, curve->getValue(0.5));
 
     // There is a discontinuity at 1. Any value between 4 and 6 is valid.
     WebTransformationMatrix value = curve->getValue(1);
     EXPECT_TRUE(value.m41() >= 4 && value.m41() <= 6);
 
     expectTranslateX(6, curve->getValue(1.5));
@@ skipping 28 matching lines @@
     EXPECT_LT(0, curve->getValue(0.25));
     EXPECT_GT(0.25, curve->getValue(0.25));
     EXPECT_NEAR(curve->getValue(0.5), 0.5, 0.00015);
     EXPECT_LT(0.75, curve->getValue(0.75));
     EXPECT_GT(1, curve->getValue(0.75));
     EXPECT_FLOAT_EQ(1, curve->getValue(1));
 }
 
 }  // namespace
 }  // namespace cc