| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layer_animation_controller.h" | 5 #include "cc/layer_animation_controller.h" |
| 6 | 6 |
| 7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 #include "cc/animation_curve.h" | 8 #include "cc/animation_curve.h" |
| 9 #include "cc/test/animation_test_common.h" | 9 #include "cc/test/animation_test_common.h" |
| 10 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include <public/WebTransformationMatrix.h> | 12 #include "ui/gfx/transform.h" |
| 13 | 13 |
| 14 using namespace WebKitTests; | 14 using namespace WebKitTests; |
| 15 using WebKit::WebTransformationMatrix; | 15 using gfx::Transform; |
| 16 | 16 |
| 17 namespace cc { | 17 namespace cc { |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 void expectTranslateX(double translateX, const WebTransformationMatrix& matrix) | 20 void expectTranslateX(double translateX, const Transform& matrix) |
| 21 { | 21 { |
| 22 EXPECT_FLOAT_EQ(translateX, matrix.m41()); | 22 EXPECT_FLOAT_EQ(translateX, matrix.matrix().getDouble(0, 3)); |
| 23 } | 23 } |
| 24 | 24 |
| 25 scoped_ptr<ActiveAnimation> createActiveAnimation(scoped_ptr<AnimationCurve> cur
ve, int id, ActiveAnimation::TargetProperty property) | 25 scoped_ptr<ActiveAnimation> createActiveAnimation(scoped_ptr<AnimationCurve> cur
ve, int id, ActiveAnimation::TargetProperty property) |
| 26 { | 26 { |
| 27 return ActiveAnimation::create(curve.Pass(), 0, id, property); | 27 return ActiveAnimation::create(curve.Pass(), 0, id, property); |
| 28 } | 28 } |
| 29 | 29 |
| 30 TEST(LayerAnimationControllerTest, syncNewAnimation) | 30 TEST(LayerAnimationControllerTest, syncNewAnimation) |
| 31 { | 31 { |
| 32 FakeLayerAnimationControllerClient dummyImpl; | 32 FakeLayerAnimationControllerClient dummyImpl; |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 | 551 |
| 552 controller->pushAnimationUpdatesTo(controllerImpl.get()); | 552 controller->pushAnimationUpdatesTo(controllerImpl.get()); |
| 553 | 553 |
| 554 activeAnimation = controllerImpl->getActiveAnimation(0, ActiveAnimation::Opa
city); | 554 activeAnimation = controllerImpl->getActiveAnimation(0, ActiveAnimation::Opa
city); |
| 555 EXPECT_TRUE(activeAnimation); | 555 EXPECT_TRUE(activeAnimation); |
| 556 EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->ru
nState()); | 556 EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->ru
nState()); |
| 557 } | 557 } |
| 558 | 558 |
| 559 } // namespace | 559 } // namespace |
| 560 } // namespace cc | 560 } // namespace cc |
| OLD | NEW |