diff options
| author | sunxd <sunxd@chromium.org> | 2016-02-22 15:01:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-22 23:02:33 +0000 |
| commit | 54e08e9da76808053379283f1ee3fdb1c0293c8d (patch) | |
| tree | d2a355dfd0e3b4cf4f91d2f2482703f3041d6d47 /cc/trees/layer_tree_host_impl.h | |
| parent | dba7978c80ce7135d4d955a95af525d411524b1f (diff) | |
| download | chromium_src-54e08e9da76808053379283f1ee3fdb1c0293c8d.zip chromium_src-54e08e9da76808053379283f1ee3fdb1c0293c8d.tar.gz chromium_src-54e08e9da76808053379283f1ee3fdb1c0293c8d.tar.bz2 | |
cc: Replace LayerImpl with ScrollNode when updating scrolling info.
ScrollState, DistributeScrollDelta and ScrollAnimated use scroll_node
instead of LayerImpl.
Move user_scrollable, clip_height and currently_scrolling_layer to
scroll_tree.
Use scroll_node->owner_id to create animation, but still use LayerImpl
for the deprecated LayerAnimationController code path.
LayerImpl::scroll_offset_ is the only left-over.
BUG=568830
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1708763002
Cr-Commit-Position: refs/heads/master@{#376838}
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 9ec92df..041b903 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -705,10 +705,10 @@ class CC_EXPORT LayerTreeHostImpl void ScrollAnimationAbort(LayerImpl* layer_impl); - void ScrollAnimationCreate(LayerImpl* layer_impl, + void ScrollAnimationCreate(ScrollNode* scroll_node, const gfx::ScrollOffset& target_offset, const gfx::ScrollOffset& current_offset); - bool ScrollAnimationUpdateTarget(LayerImpl* layer_impl, + bool ScrollAnimationUpdateTarget(ScrollNode* scroll_node, const gfx::Vector2dF& scroll_delta); using UIResourceMap = std::unordered_map<UIResourceId, UIResourceData>; |