diff options
author | sunxd <sunxd@chromium.org> | 2016-03-16 17:49:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 00:51:06 +0000 |
commit | 2668bea689fd4a5ce07011903bca095aaf67bb07 (patch) | |
tree | 3554460a202e1e7f26bbe6e99f1f5ef517030e82 /cc/trees/layer_tree_host_impl.h | |
parent | ad3070d0f8f9b7513222014d218d0937da6d8077 (diff) | |
download | chromium_src-2668bea689fd4a5ce07011903bca095aaf67bb07.zip chromium_src-2668bea689fd4a5ce07011903bca095aaf67bb07.tar.gz chromium_src-2668bea689fd4a5ce07011903bca095aaf67bb07.tar.bz2 |
cc: Impl thread scroll on ScrollNode instead of LayerImpl
BUG=568830
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1805343006
Cr-Commit-Position: refs/heads/master@{#381614}
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
-rw-r--r-- | cc/trees/layer_tree_host_impl.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 7a8aca72..026294b 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -170,7 +170,7 @@ class CC_EXPORT LayerTreeHostImpl InputHandler::ScrollStatus ScrollAnimated( const gfx::Point& viewport_point, const gfx::Vector2dF& scroll_delta) override; - void ApplyScroll(LayerImpl* layer, ScrollState* scroll_state); + void ApplyScroll(ScrollNode* scroll_node, ScrollState* scroll_state); InputHandlerScrollResult ScrollBy(ScrollState* scroll_state) override; bool ScrollVerticallyByPage(const gfx::Point& viewport_point, ScrollDirection direction) override; @@ -574,10 +574,11 @@ class CC_EXPORT LayerTreeHostImpl return frame_timing_tracker_.get(); } - gfx::Vector2dF ScrollLayer(LayerImpl* layer_impl, - const gfx::Vector2dF& delta, - const gfx::Point& viewport_point, - bool is_direct_manipulation); + gfx::Vector2dF ScrollSingleNode(ScrollNode* scroll_node, + const gfx::Vector2dF& delta, + const gfx::Point& viewport_point, + bool is_direct_manipulation, + ScrollTree* scroll_tree); // Record main frame timing information. // |start_of_main_frame_args| is the BeginFrameArgs of the beginning of the @@ -636,10 +637,11 @@ class CC_EXPORT LayerTreeHostImpl BeginFrameTracker current_begin_frame_tracker_; private: - gfx::Vector2dF ScrollLayerWithViewportSpaceDelta( - LayerImpl* layer_impl, + gfx::Vector2dF ScrollNodeWithViewportSpaceDelta( + ScrollNode* scroll_node, const gfx::PointF& viewport_point, - const gfx::Vector2dF& viewport_delta); + const gfx::Vector2dF& viewport_delta, + ScrollTree* scroll_tree); void CreateAndSetRenderer(); void CleanUpTileManagerAndUIResources(); |