| Index: cc/input/scroll_state.cc
|
| diff --git a/cc/input/scroll_state.cc b/cc/input/scroll_state.cc
|
| index 419b5904363ea02be74552f7a0ece21d7b441560..d70d7d4efc04b44eac8b7e04ace6c22444e263dd 100644
|
| --- a/cc/input/scroll_state.cc
|
| +++ b/cc/input/scroll_state.cc
|
| @@ -20,8 +20,8 @@ ScrollState::ScrollState(double delta_x,
|
| bool is_in_inertial_phase,
|
| bool is_ending,
|
| bool should_propagate,
|
| - bool delta_consumed_for_scroll_sequence,
|
| - bool is_direct_manipulation)
|
| + bool is_direct_manipulation,
|
| + bool delta_consumed_for_scroll_sequence)
|
| : data_(delta_x,
|
| delta_y,
|
| start_position_x,
|
| @@ -32,8 +32,10 @@ ScrollState::ScrollState(double delta_x,
|
| is_in_inertial_phase,
|
| is_ending,
|
| should_propagate,
|
| - delta_consumed_for_scroll_sequence,
|
| - is_direct_manipulation) {}
|
| + true, // TODO(tdresser): populate from_user_input.
|
| + is_direct_manipulation,
|
| + 0, // TODO(tdresser): populate delta_granularity.
|
| + delta_consumed_for_scroll_sequence) {}
|
|
|
| ScrollState::ScrollState(ScrollStateData data) : data_(data) {}
|
|
|
|
|