| Index: cc/input/scroll_state_data.cc
|
| diff --git a/cc/input/scroll_state_data.cc b/cc/input/scroll_state_data.cc
|
| index 1eb1cebb8d1579e4da7f720f4b4e5e6801215829..a167cda5876a24fed367bb2a7da2060e22cca7cc 100644
|
| --- a/cc/input/scroll_state_data.cc
|
| +++ b/cc/input/scroll_state_data.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "cc/input/scroll_state_data.h"
|
|
|
| +#include "cc/layers/layer_impl.h"
|
| +
|
| namespace cc {
|
|
|
| ScrollStateData::ScrollStateData(double delta_x,
|
| @@ -16,8 +18,10 @@ ScrollStateData::ScrollStateData(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 from_user_input,
|
| + bool is_direct_manipulation,
|
| + double delta_granularity,
|
| + bool delta_consumed_for_scroll_sequence)
|
| : delta_x(delta_x),
|
| delta_y(delta_y),
|
| start_position_x(start_position_x),
|
| @@ -28,11 +32,14 @@ ScrollStateData::ScrollStateData(double delta_x,
|
| is_in_inertial_phase(is_in_inertial_phase),
|
| is_ending(is_ending),
|
| should_propagate(should_propagate),
|
| - current_native_scrolling_layer(nullptr),
|
| + from_user_input(from_user_input),
|
| delta_consumed_for_scroll_sequence(delta_consumed_for_scroll_sequence),
|
| is_direct_manipulation(is_direct_manipulation),
|
| + delta_granularity(delta_granularity),
|
| caused_scroll_x(false),
|
| - caused_scroll_y(false) {}
|
| + caused_scroll_y(false),
|
| + current_native_scrolling_layer_(nullptr),
|
| + current_native_scrolling_element_(0) {}
|
|
|
| ScrollStateData::ScrollStateData()
|
| : ScrollStateData(0,
|
| @@ -46,6 +53,27 @@ ScrollStateData::ScrollStateData()
|
| false,
|
| true,
|
| false,
|
| - false) {}
|
| + false,
|
| + false,
|
| + 0) {}
|
| +
|
| +LayerImpl* ScrollStateData::current_native_scrolling_layer() const {
|
| + return current_native_scrolling_layer_;
|
| +}
|
| +void ScrollStateData::set_current_native_scrolling_layer(
|
| + LayerImpl* current_native_scrolling_layer) {
|
| + current_native_scrolling_layer_ = current_native_scrolling_layer;
|
| + current_native_scrolling_element_ = 0;
|
| +}
|
| +uint64_t ScrollStateData::current_native_scrolling_element() const {
|
| + if (current_native_scrolling_layer_)
|
| + return current_native_scrolling_layer_->element_id();
|
| + return current_native_scrolling_element_;
|
| +}
|
| +void ScrollStateData::set_current_native_scrolling_element(
|
| + uint64_t element_id) {
|
| + current_native_scrolling_element_ = element_id;
|
| + current_native_scrolling_layer_ = nullptr;
|
| +}
|
|
|
| } // namespace cc
|
|
|