diff options
Diffstat (limited to 'cc')
-rw-r--r-- | cc/input/scroll_state.cc | 8 | ||||
-rw-r--r-- | cc/input/scroll_state.h | 10 | ||||
-rw-r--r-- | cc/trees/layer_tree_host_impl.cc | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/cc/input/scroll_state.cc b/cc/input/scroll_state.cc index 5591eae..f0e7751 100644 --- a/cc/input/scroll_state.cc +++ b/cc/input/scroll_state.cc @@ -6,13 +6,11 @@ #include <utility> -#include "cc/layers/layer_impl.h" -#include "cc/layers/layer_list_impl.h" +#include "cc/trees/layer_tree_impl.h" namespace cc { -ScrollState::ScrollState(ScrollStateData data) - : data_(data), layer_list_impl_(nullptr) {} +ScrollState::ScrollState(ScrollStateData data) : data_(data) {} ScrollState::ScrollState(const ScrollState& other) = default; @@ -30,7 +28,7 @@ void ScrollState::DistributeToScrollChainDescendant() { if (!scroll_chain_.empty()) { const ScrollNode* next = scroll_chain_.front(); scroll_chain_.pop_front(); - layer_list_impl_->LayerById(next->owner_id)->DistributeScroll(this); + layer_tree_impl_->list()->LayerById(next->owner_id)->DistributeScroll(this); } } diff --git a/cc/input/scroll_state.h b/cc/input/scroll_state.h index 0e17297..35a4f97 100644 --- a/cc/input/scroll_state.h +++ b/cc/input/scroll_state.h @@ -15,7 +15,7 @@ namespace cc { -class LayerListImpl; +class LayerTreeImpl; // ScrollState is based on the proposal for scroll customization in blink, found // here: https://goo.gl/1ipTpP. @@ -61,10 +61,10 @@ class CC_EXPORT ScrollState { data_.is_direct_manipulation = is_direct_manipulation; } - void set_scroll_chain_and_layer_list( + void set_scroll_chain_and_layer_tree( const std::list<const ScrollNode*>& scroll_chain, - LayerListImpl* layer_list_impl) { - layer_list_impl_ = layer_list_impl; + LayerTreeImpl* layer_tree_impl) { + layer_tree_impl_ = layer_tree_impl; scroll_chain_ = scroll_chain; } @@ -97,7 +97,7 @@ class CC_EXPORT ScrollState { private: ScrollStateData data_; - LayerListImpl* layer_list_impl_; + LayerTreeImpl* layer_tree_impl_; std::list<const ScrollNode*> scroll_chain_; }; diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 8757f14..ab3e020 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -2977,8 +2977,8 @@ void LayerTreeHostImpl::DistributeScrollDelta(ScrollState* scroll_state) { current_scroll_chain.push_front(scroll_node); } } - scroll_state->set_scroll_chain_and_layer_list(current_scroll_chain, - active_list()); + scroll_state->set_scroll_chain_and_layer_tree(current_scroll_chain, + active_tree()); scroll_state->DistributeToScrollChainDescendant(); } |