| Index: cc/scrollbar_animation_controller_linear_fade_unittest.cc
|
| diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
|
| index e3c2c230f16c1ab0f67d28e6d32ba2cb10de8377..a5c388019a335e1dd0853bfca0327ad21122ed7e 100644
|
| --- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc
|
| +++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
|
| @@ -101,14 +101,14 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByScroll)
|
| EXPECT_FLOAT_EQ(0, m_scrollbarLayer->opacity());
|
| }
|
|
|
| -TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch)
|
| +TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByPinch)
|
| {
|
| base::TimeTicks time;
|
| + time += base::TimeDelta::FromSeconds(1);
|
| m_scrollbarController->didPinchGestureUpdate(time);
|
| m_scrollbarController->animate(time);
|
| EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
|
|
|
| - time += base::TimeDelta::FromSeconds(1);
|
| m_scrollbarController->animate(time);
|
| EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
|
|
|
| @@ -128,14 +128,14 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch)
|
|
|
| time += base::TimeDelta::FromSeconds(1);
|
| m_scrollbarController->animate(time);
|
| - EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
|
| + EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity());
|
|
|
| time += base::TimeDelta::FromSeconds(1);
|
| m_scrollbarController->animate(time);
|
| - EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
|
| + EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity());
|
|
|
| time += base::TimeDelta::FromSeconds(1);
|
| - m_scrollbarController->didPinchGestureEnd(time);
|
| + m_scrollbarController->didPinchGestureUpdate(time);
|
| m_scrollbarController->animate(time);
|
| EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
|
|
|
|
|