diff options
| author | weiliangc <weiliangc@chromium.org> | 2016-03-01 15:04:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 23:05:29 +0000 |
| commit | f3ca89fbea7aa9a4c0aebaa94a1b0033437b43b9 (patch) | |
| tree | f31ef5f0d7d9c20ea1a9752f5ce50e8bdc75b91b /cc/input | |
| parent | 3b7b8b27fd11096c0eaff14c44656481b669be5e (diff) | |
| download | chromium_src-f3ca89fbea7aa9a4c0aebaa94a1b0033437b43b9.zip chromium_src-f3ca89fbea7aa9a4c0aebaa94a1b0033437b43b9.tar.gz chromium_src-f3ca89fbea7aa9a4c0aebaa94a1b0033437b43b9.tar.bz2 | |
Revert of Port ScrollState to LayerListImpl (patchset #3 id:40001 of https://codereview.chromium.org/1747253002/ )
Reason for revert:
No need to rename everything yet.
Original issue's description:
> Port ScrollState to LayerListImpl
>
> BUG=557194
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/b7fd9e634dc35fa9e962956a77f2d122b5066891
> Cr-Commit-Position: refs/heads/master@{#378476}
TBR=ajuma@chromium.org,vollick@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=557194
Review URL: https://codereview.chromium.org/1755863002
Cr-Commit-Position: refs/heads/master@{#378591}
Diffstat (limited to 'cc/input')
| -rw-r--r-- | cc/input/scroll_state.cc | 8 | ||||
| -rw-r--r-- | cc/input/scroll_state.h | 10 |
2 files changed, 8 insertions, 10 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_; }; |