diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/tests/WebAnimationTest.cpp | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/tests/WebAnimationTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/WebAnimationTest.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/WebKit/chromium/tests/WebAnimationTest.cpp b/Source/WebKit/chromium/tests/WebAnimationTest.cpp index c2ccc4503..a682ab020 100644 --- a/Source/WebKit/chromium/tests/WebAnimationTest.cpp +++ b/Source/WebKit/chromium/tests/WebAnimationTest.cpp @@ -47,13 +47,13 @@ namespace { TEST(WebAnimationTest, MAYBE_DefaultSettings) { WebFloatAnimationCurve curve; - WebAnimation animation(curve, WebAnimation::TargetPropertyOpacity); + OwnPtr<WebAnimation> animation = adoptPtr(WebAnimation::create(curve, WebAnimation::TargetPropertyOpacity)); // Ensure that the defaults are correct. - EXPECT_EQ(1, animation.iterations()); - EXPECT_EQ(0, animation.startTime()); - EXPECT_EQ(0, animation.timeOffset()); - EXPECT_FALSE(animation.alternatesDirection()); + EXPECT_EQ(1, animation->iterations()); + EXPECT_EQ(0, animation->startTime()); + EXPECT_EQ(0, animation->timeOffset()); + EXPECT_FALSE(animation->alternatesDirection()); } // Linux/Win bots failed on this test. @@ -68,16 +68,16 @@ TEST(WebAnimationTest, MAYBE_DefaultSettings) TEST(WebAnimationTest, MAYBE_ModifiedSettings) { WebFloatAnimationCurve curve; - WebAnimation animation(curve, WebAnimation::TargetPropertyOpacity); - animation.setIterations(2); - animation.setStartTime(2); - animation.setTimeOffset(2); - animation.setAlternatesDirection(true); + OwnPtr<WebAnimation> animation = adoptPtr(WebAnimation::create(curve, WebAnimation::TargetPropertyOpacity)); + animation->setIterations(2); + animation->setStartTime(2); + animation->setTimeOffset(2); + animation->setAlternatesDirection(true); - EXPECT_EQ(2, animation.iterations()); - EXPECT_EQ(2, animation.startTime()); - EXPECT_EQ(2, animation.timeOffset()); - EXPECT_TRUE(animation.alternatesDirection()); + EXPECT_EQ(2, animation->iterations()); + EXPECT_EQ(2, animation->startTime()); + EXPECT_EQ(2, animation->timeOffset()); + EXPECT_TRUE(animation->alternatesDirection()); } } // namespace |
