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

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

Issue 2472943003: Revert "Touchpad scroll latching enabled for Mac behind flag." (Closed)
Patch Set: Better merge. Created 4 years, 1 month 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 | « no previous file | 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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 587
588 // Returns true if a scroll offset animation is created and false if we scroll 588 // Returns true if a scroll offset animation is created and false if we scroll
589 // by the desired amount without an animation. 589 // by the desired amount without an animation.
590 bool ScrollAnimationCreate(ScrollNode* scroll_node, 590 bool ScrollAnimationCreate(ScrollNode* scroll_node,
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() {
598 ClearCurrentlyScrollingLayer();
599 }
600
601 protected: 597 protected:
602 LayerTreeHostImpl( 598 LayerTreeHostImpl(
603 const LayerTreeSettings& settings, 599 const LayerTreeSettings& settings,
604 LayerTreeHostImplClient* client, 600 LayerTreeHostImplClient* client,
605 TaskRunnerProvider* task_runner_provider, 601 TaskRunnerProvider* task_runner_provider,
606 RenderingStatsInstrumentation* rendering_stats_instrumentation, 602 RenderingStatsInstrumentation* rendering_stats_instrumentation,
607 SharedBitmapManager* shared_bitmap_manager, 603 SharedBitmapManager* shared_bitmap_manager,
608 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 604 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
609 TaskGraphRunner* task_graph_runner, 605 TaskGraphRunner* task_graph_runner,
610 std::unique_ptr<AnimationHost> animation_host, 606 std::unique_ptr<AnimationHost> animation_host,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 834
839 std::unique_ptr<PendingTreeDurationHistogramTimer> 835 std::unique_ptr<PendingTreeDurationHistogramTimer>
840 pending_tree_duration_timer_; 836 pending_tree_duration_timer_;
841 837
842 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 838 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
843 }; 839 };
844 840
845 } // namespace cc 841 } // namespace cc
846 842
847 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 843 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698