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

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

Issue 2703823002: Record scroll_layer_id instead of scrollbar_animation_controller pointer (Closed)
Patch Set: rebase Created 3 years, 10 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 | « 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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 735
736 // In impl-side painting mode, inert tree with layers that can be recycled 736 // In impl-side painting mode, inert tree with layers that can be recycled
737 // by the next sync from the main thread. 737 // by the next sync from the main thread.
738 std::unique_ptr<LayerTreeImpl> recycle_tree_; 738 std::unique_ptr<LayerTreeImpl> recycle_tree_;
739 739
740 InputHandlerClient* input_handler_client_; 740 InputHandlerClient* input_handler_client_;
741 bool did_lock_scrolling_layer_; 741 bool did_lock_scrolling_layer_;
742 bool wheel_scrolling_; 742 bool wheel_scrolling_;
743 bool scroll_affects_scroll_handler_; 743 bool scroll_affects_scroll_handler_;
744 int scroll_layer_id_mouse_currently_over_; 744 int scroll_layer_id_mouse_currently_over_;
745 int scroll_layer_id_mouse_currently_captured_;
745 746
746 std::vector<std::unique_ptr<SwapPromise>> 747 std::vector<std::unique_ptr<SwapPromise>>
747 swap_promises_for_main_thread_scroll_update_; 748 swap_promises_for_main_thread_scroll_update_;
748 749
749 // An object to implement the ScrollElasticityHelper interface and 750 // An object to implement the ScrollElasticityHelper interface and
750 // hold all state related to elasticity. May be NULL if never requested. 751 // hold all state related to elasticity. May be NULL if never requested.
751 std::unique_ptr<ScrollElasticityHelper> scroll_elasticity_helper_; 752 std::unique_ptr<ScrollElasticityHelper> scroll_elasticity_helper_;
752 753
753 bool tile_priorities_dirty_; 754 bool tile_priorities_dirty_;
754 755
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 gfx::Rect viewport_damage_rect_; 800 gfx::Rect viewport_damage_rect_;
800 801
801 std::unique_ptr<MutatorHost> mutator_host_; 802 std::unique_ptr<MutatorHost> mutator_host_;
802 std::set<VideoFrameController*> video_frame_controllers_; 803 std::set<VideoFrameController*> video_frame_controllers_;
803 804
804 // Map from scroll layer ID to scrollbar animation controller. 805 // Map from scroll layer ID to scrollbar animation controller.
805 // There is one animation controller per pair of overlay scrollbars. 806 // There is one animation controller per pair of overlay scrollbars.
806 std::unordered_map<int, std::unique_ptr<ScrollbarAnimationController>> 807 std::unordered_map<int, std::unique_ptr<ScrollbarAnimationController>>
807 scrollbar_animation_controllers_; 808 scrollbar_animation_controllers_;
808 809
809 ScrollbarAnimationController* captured_scrollbar_animation_controller_;
810
811 RenderingStatsInstrumentation* rendering_stats_instrumentation_; 810 RenderingStatsInstrumentation* rendering_stats_instrumentation_;
812 MicroBenchmarkControllerImpl micro_benchmark_controller_; 811 MicroBenchmarkControllerImpl micro_benchmark_controller_;
813 std::unique_ptr<SynchronousTaskGraphRunner> 812 std::unique_ptr<SynchronousTaskGraphRunner>
814 single_thread_synchronous_task_graph_runner_; 813 single_thread_synchronous_task_graph_runner_;
815 814
816 // Optional callback to notify of new tree activations. 815 // Optional callback to notify of new tree activations.
817 base::Closure tree_activation_callback_; 816 base::Closure tree_activation_callback_;
818 817
819 TaskGraphRunner* task_graph_runner_; 818 TaskGraphRunner* task_graph_runner_;
820 int id_; 819 int id_;
(...skipping 13 matching lines...) Expand all
834 833
835 std::unique_ptr<PendingTreeDurationHistogramTimer> 834 std::unique_ptr<PendingTreeDurationHistogramTimer>
836 pending_tree_duration_timer_; 835 pending_tree_duration_timer_;
837 836
838 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 837 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
839 }; 838 };
840 839
841 } // namespace cc 840 } // namespace cc
842 841
843 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 842 #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