| Index: webkit/compositor_bindings/web_animation_unittest.cc
|
| diff --git a/webkit/compositor_bindings/web_animation_unittest.cc b/webkit/compositor_bindings/web_animation_unittest.cc
|
| index 4fc1ba058d897f8295627216e6fcce0ec4340713..925a78b1107feaad324317ef3456b7e7acfe482b 100644
|
| --- a/webkit/compositor_bindings/web_animation_unittest.cc
|
| +++ b/webkit/compositor_bindings/web_animation_unittest.cc
|
| @@ -7,14 +7,17 @@
|
| #include "webkit/compositor_bindings/web_animation_impl.h"
|
| #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
|
|
|
| -using namespace WebKit;
|
| +using WebKit::WebAnimation;
|
| +using WebKit::WebAnimationCurve;
|
| +using WebKit::WebFloatAnimationCurve;
|
|
|
| +namespace webkit {
|
| namespace {
|
|
|
| TEST(WebAnimationTest, DefaultSettings) {
|
| scoped_ptr<WebAnimationCurve> curve(new WebFloatAnimationCurveImpl());
|
| scoped_ptr<WebAnimation> animation(
|
| - new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1));
|
| + new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1, 0));
|
|
|
| // Ensure that the defaults are correct.
|
| EXPECT_EQ(1, animation->iterations());
|
| @@ -26,7 +29,7 @@ TEST(WebAnimationTest, DefaultSettings) {
|
| TEST(WebAnimationTest, ModifiedSettings) {
|
| scoped_ptr<WebFloatAnimationCurve> curve(new WebFloatAnimationCurveImpl());
|
| scoped_ptr<WebAnimation> animation(
|
| - new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1));
|
| + new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1, 0));
|
| animation->setIterations(2);
|
| animation->setStartTime(2);
|
| animation->setTimeOffset(2);
|
| @@ -39,3 +42,4 @@ TEST(WebAnimationTest, ModifiedSettings) {
|
| }
|
|
|
| } // namespace
|
| +} // namespace webkit
|
|
|