trunk/src/content/renderer/input/input_handler_proxy_unittest.cc - Issue 254883004: Revert 266624 "cc: Split animating and drawing into separate act..."

Unified Diff: trunk/src/content/renderer/input/input_handler_proxy_unittest.cc

Issue 254883004: Revert 266624 "cc: Split animating and drawing into separate act..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: trunk/src/content/renderer/input/input_handler_proxy_unittest.cc

===================================================================

--- trunk/src/content/renderer/input/input_handler_proxy_unittest.cc (revision 266894)

+++ trunk/src/content/renderer/input/input_handler_proxy_unittest.cc (working copy)

@@ -43,7 +43,7 @@

void(float magnify_delta, const gfx::Point& anchor));

MOCK_METHOD0(PinchGestureEnd, void());

- MOCK_METHOD0(SetNeedsAnimate, void());

+ MOCK_METHOD0(ScheduleAnimation, void());

MOCK_METHOD2(ScrollBegin,

ScrollStatus(const gfx::Point& viewport_point,

@@ -405,7 +405,7 @@

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_, ScrollEnd());

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

gesture_.type = WebInputEvent::GestureFlingStart;

gesture_.data.flingStart.velocityX = 10;

@@ -488,7 +488,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_, ScrollEnd());

@@ -500,7 +500,7 @@

// fling start will typically include the last scroll from the gesture that

// lead to the scroll (either wheel or gesture scroll), so there should be no

// visible hitch.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.Times(0);

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

@@ -509,7 +509,7 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second call should start scrolling in the -X direction.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_,

@@ -562,7 +562,7 @@

// Since we've aborted the fling, the next animation should be a no-op and

// should not result in another

// frame being requested.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate()).Times(0);

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation()).Times(0);

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.Times(0);

time += base::TimeDelta::FromMilliseconds(100);

@@ -597,7 +597,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_, ScrollEnd());

@@ -607,7 +607,7 @@

// Start the fling animation at time 10. This shouldn't actually scroll, just

// establish a start time.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.Times(0);

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

@@ -616,7 +616,7 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second call should start scrolling in the -X direction.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_,

@@ -670,7 +670,7 @@

// Since we've aborted the fling, the next animation should be a no-op and

// should not result in another

// frame being requested.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate()).Times(0);

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation()).Times(0);

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.Times(0);

time += base::TimeDelta::FromMilliseconds(100);

@@ -702,7 +702,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_, ScrollEnd());

@@ -712,7 +712,7 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// Start the second fling animation at time 30.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.Times(0);

time = base::TimeTicks() + base::TimeDelta::FromSeconds(30);

@@ -721,7 +721,7 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// Tick the second fling once normally.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_,

@@ -776,7 +776,7 @@

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

gesture_.type = WebInputEvent::GestureFlingStart;

gesture_.data.flingStart.velocityX = 10;

@@ -881,7 +881,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

@@ -892,14 +892,14 @@

// fling start will typically include the last scroll from the gesture that

// lead to the scroll (either wheel or gesture scroll), so there should be no

// visible hitch.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second call should start scrolling in the -X direction.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::x, testing::Lt(0))))

@@ -945,7 +945,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

@@ -956,7 +956,7 @@

// the likelihood of a hitch between the scroll preceding the fling and

// the first scroll generated by the fling.

// Scrolling should start in the -X direction.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::x, testing::Lt(0))))

@@ -1005,7 +1005,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

@@ -1020,14 +1020,14 @@

// fling start will typically include the last scroll from the gesture that

// lead to the scroll (either wheel or gesture scroll), so there should be no

// visible hitch.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second call should start scrolling in the -X direction.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::x, testing::Lt(0))))

@@ -1057,7 +1057,7 @@

WebFloatPoint fling_delta = WebFloatPoint(1000, 1000);

gesture_.data.flingStart.velocityX = fling_delta.x;

gesture_.data.flingStart.velocityY = fling_delta.y;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_, ScrollEnd());

@@ -1065,13 +1065,13 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The first animate doesn't cause any scrolling.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second animate starts scrolling in the positive X and Y directions.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_,

@@ -1099,7 +1099,7 @@

latest_overscroll_delta);

// The next call to animate will no longer scroll vertically.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, ScrollBegin(testing::_, testing::_))

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_CALL(mock_input_handler_,

@@ -1144,7 +1144,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

@@ -1152,7 +1152,7 @@

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// With an animation timestamp equivalent to the starting timestamp, the

// animation will simply be rescheduled.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

@@ -1160,7 +1160,7 @@

// A small time delta should not stop the fling, even if the client

// reports no scrolling.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::x, testing::Lt(0))))

@@ -1173,7 +1173,7 @@

// A time delta of zero should not stop the fling, and neither should it

// trigger scrolling on the client.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

@@ -1213,18 +1213,18 @@

gesture_.data.flingStart.velocityY = fling_delta.y;

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The first animate doesn't cause any scrolling.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);

input_handler_->Animate(time);

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

// The second animate starts scrolling in the positive X and Y directions.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::y, testing::Lt(0))))

@@ -1249,7 +1249,7 @@

latest_overscroll_delta);

// The next call to animate will no longer scroll vertically.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::y, testing::Eq(0))))

@@ -1274,7 +1274,7 @@

latest_overscroll_delta);

// The next call to animate will no longer scroll horizontally or vertically,

// and the fling should be cancelled.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate()).Times(0);

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation()).Times(0);

EXPECT_CALL(mock_input_handler_, ScrollBy(testing::_, testing::_)).Times(0);

EXPECT_CALL(mock_input_handler_, ScrollEnd());

time += base::TimeDelta::FromMilliseconds(10);

@@ -1363,7 +1363,7 @@

gesture_.data.flingStart.velocityY = fling_delta.y;

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

EXPECT_TRUE(input_handler_->gesture_scroll_on_impl_thread_for_testing());

testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);

@@ -1418,7 +1418,7 @@

gesture_.globalX = fling_global_point.x;

gesture_.globalY = fling_global_point.y;

gesture_.modifiers = modifiers;

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_, FlingScrollBegin())

.WillOnce(testing::Return(cc::InputHandler::ScrollStarted));

EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));

@@ -1428,7 +1428,7 @@

// If we get a negative time delta, that is, the Animation tick time happens

// before the fling's start time then we should *not* try scrolling and

// instead reset the fling start time.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::_)).Times(0);

@@ -1440,7 +1440,7 @@

// The first call should have reset the start time so subsequent calls should

// generate scroll events.

- EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());

+ EXPECT_CALL(mock_input_handler_, ScheduleAnimation());

EXPECT_CALL(mock_input_handler_,

ScrollBy(testing::_,

testing::Property(&gfx::Vector2dF::x, testing::Lt(0))))

« no previous file with comments | « trunk/src/content/renderer/input/input_handler_proxy.cc ('k') | no next file » | no next file with comments »