Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: cc/trees/layer_tree_host_impl.h

Issue 2365793002: Fix scroll chaining for non-descendants of root scroller. (Closed)
Patch Set: Rebase and remove hack Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/viewport.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_
6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <bitset> 10 #include <bitset>
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 const gfx::Vector2dF& scroll_amount, 591 const gfx::Vector2dF& scroll_amount,
592 base::TimeDelta delayed_by); 592 base::TimeDelta delayed_by);
593 593
594 void SetLayerTreeMutator(std::unique_ptr<LayerTreeMutator> mutator); 594 void SetLayerTreeMutator(std::unique_ptr<LayerTreeMutator> mutator);
595 LayerTreeMutator* mutator() { return mutator_.get(); } 595 LayerTreeMutator* mutator() { return mutator_.get(); }
596 596
597 void ClearCurrentlyScrollingLayerForTesting() { 597 void ClearCurrentlyScrollingLayerForTesting() {
598 ClearCurrentlyScrollingLayer(); 598 ClearCurrentlyScrollingLayer();
599 } 599 }
600 600
601 LayerImpl* ViewportMainScrollLayer();
602
601 protected: 603 protected:
602 LayerTreeHostImpl( 604 LayerTreeHostImpl(
603 const LayerTreeSettings& settings, 605 const LayerTreeSettings& settings,
604 LayerTreeHostImplClient* client, 606 LayerTreeHostImplClient* client,
605 TaskRunnerProvider* task_runner_provider, 607 TaskRunnerProvider* task_runner_provider,
606 RenderingStatsInstrumentation* rendering_stats_instrumentation, 608 RenderingStatsInstrumentation* rendering_stats_instrumentation,
607 SharedBitmapManager* shared_bitmap_manager, 609 SharedBitmapManager* shared_bitmap_manager,
608 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 610 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
609 TaskGraphRunner* task_graph_runner, 611 TaskGraphRunner* task_graph_runner,
610 std::unique_ptr<AnimationHost> animation_host, 612 std::unique_ptr<AnimationHost> animation_host,
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 839
838 std::unique_ptr<PendingTreeDurationHistogramTimer> 840 std::unique_ptr<PendingTreeDurationHistogramTimer>
839 pending_tree_duration_timer_; 841 pending_tree_duration_timer_;
840 842
841 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 843 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
842 }; 844 };
843 845
844 } // namespace cc 846 } // namespace cc
845 847
846 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 848 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/viewport.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698