| Index: cc/trees/layer_tree_host_unittest_scroll.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| index 0c499773a00927a95844abfd7824773d0c17095f..08269d76894c87ff7b0e02f66c64fe67595e7475 100644
|
| --- a/cc/trees/layer_tree_host_unittest_scroll.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| @@ -30,19 +30,30 @@ namespace cc {
|
| namespace {
|
|
|
| scoped_ptr<ScrollState> BeginState(const gfx::Point& point) {
|
| - return ScrollState::Create(gfx::Vector2dF(), point, gfx::Vector2dF(), true,
|
| - false, false);
|
| + ScrollStateData scroll_state_data;
|
| + scroll_state_data.is_beginning = true;
|
| + scroll_state_data.start_position_x = point.x();
|
| + scroll_state_data.start_position_y = point.y();
|
| + scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
|
| + return scroll_state;
|
| }
|
|
|
| scoped_ptr<ScrollState> UpdateState(const gfx::Point& point,
|
| const gfx::Vector2dF& delta) {
|
| - return ScrollState::Create(delta, point, gfx::Vector2dF(), false, false,
|
| - false);
|
| + ScrollStateData scroll_state_data;
|
| + scroll_state_data.delta_x = delta.x();
|
| + scroll_state_data.delta_y = delta.y();
|
| + scroll_state_data.start_position_x = point.x();
|
| + scroll_state_data.start_position_y = point.y();
|
| + scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
|
| + return scroll_state;
|
| }
|
|
|
| scoped_ptr<ScrollState> EndState() {
|
| - return ScrollState::Create(gfx::Vector2dF(), gfx::Point(), gfx::Vector2dF(),
|
| - false, false, true);
|
| + ScrollStateData scroll_state_data;
|
| + scroll_state_data.is_ending = true;
|
| + scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
|
| + return scroll_state;
|
| }
|
|
|
| class LayerTreeHostScrollTest : public LayerTreeTest {
|
|
|