diff options
Diffstat (limited to 'cc/scrollbar_animation_controller_linear_fade_unittest.cc')
| -rw-r--r-- | cc/scrollbar_animation_controller_linear_fade_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc index 592d793..32537cb 100644 --- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc @@ -23,8 +23,8 @@ protected: m_contentLayer = m_scrollLayer->children()[0]; m_scrollbarLayer = ScrollbarLayerImpl::create(3); - m_scrollLayer->setMaxScrollOffset(gfx::Vector2d(50, 50)); - m_contentLayer->setBounds(gfx::Size(50, 50)); + m_scrollLayer->setMaxScrollPosition(IntSize(50, 50)); + m_contentLayer->setBounds(IntSize(50, 50)); m_scrollbarController = ScrollbarAnimationControllerLinearFade::create(m_scrollLayer.get(), 2, 3); m_scrollbarController->setHorizontalScrollbarLayer(m_scrollbarLayer.get()); @@ -50,13 +50,13 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyHiddenInBegin) TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByScroll) { - m_scrollLayer->setScrollDelta(gfx::Vector2d(1, 1)); + m_scrollLayer->setScrollDelta(IntSize(1, 1)); m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 0); m_scrollbarController->animate(0); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); m_scrollbarController->animate(1); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); - m_scrollLayer->setScrollDelta(gfx::Vector2d(2, 2)); + m_scrollLayer->setScrollDelta(IntSize(2, 2)); m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 1); m_scrollbarController->animate(2); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); @@ -68,7 +68,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByScroll) EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity()); m_scrollbarController->animate(5); EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity()); - m_scrollLayer->setScrollDelta(gfx::Vector2d(3, 3)); + m_scrollLayer->setScrollDelta(IntSize(3, 3)); m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 5); m_scrollbarController->animate(6); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); @@ -90,7 +90,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch) EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); m_scrollbarController->animate(1); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); - m_scrollLayer->setScrollDelta(gfx::Vector2d(1, 1)); + m_scrollLayer->setScrollDelta(IntSize(1, 1)); m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 1); m_scrollbarController->animate(2); EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity()); |