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

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

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: Created 4 years, 11 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
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 <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <unordered_map>
12 #include <vector> 13 #include <vector>
13 14
14 #include "base/containers/hash_tables.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "cc/animation/animation_events.h" 18 #include "cc/animation/animation_events.h"
19 #include "cc/animation/animation_registrar.h" 19 #include "cc/animation/animation_registrar.h"
20 #include "cc/animation/scrollbar_animation_controller.h" 20 #include "cc/animation/scrollbar_animation_controller.h"
21 #include "cc/base/cc_export.h" 21 #include "cc/base/cc_export.h"
22 #include "cc/base/synced_property.h" 22 #include "cc/base/synced_property.h"
23 #include "cc/debug/frame_timing_tracker.h" 23 #include "cc/debug/frame_timing_tracker.h"
24 #include "cc/debug/micro_benchmark_controller_impl.h" 24 #include "cc/debug/micro_benchmark_controller_impl.h"
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 void NotifySwapPromiseMonitorsOfForwardingToMainThread(); 695 void NotifySwapPromiseMonitorsOfForwardingToMainThread();
696 696
697 void UpdateRootLayerStateForSynchronousInputHandler(); 697 void UpdateRootLayerStateForSynchronousInputHandler();
698 698
699 void ScrollAnimationCreate(LayerImpl* layer_impl, 699 void ScrollAnimationCreate(LayerImpl* layer_impl,
700 const gfx::ScrollOffset& target_offset, 700 const gfx::ScrollOffset& target_offset,
701 const gfx::ScrollOffset& current_offset); 701 const gfx::ScrollOffset& current_offset);
702 bool ScrollAnimationUpdateTarget(LayerImpl* layer_impl, 702 bool ScrollAnimationUpdateTarget(LayerImpl* layer_impl,
703 const gfx::Vector2dF& scroll_delta); 703 const gfx::Vector2dF& scroll_delta);
704 704
705 typedef base::hash_map<UIResourceId, UIResourceData> 705 typedef std::unordered_map<UIResourceId, UIResourceData> UIResourceMap;
706 UIResourceMap;
707 UIResourceMap ui_resource_map_; 706 UIResourceMap ui_resource_map_;
708 707
709 // Resources that were evicted by EvictAllUIResources. Resources are removed 708 // Resources that were evicted by EvictAllUIResources. Resources are removed
710 // from this when they are touched by a create or destroy from the UI resource 709 // from this when they are touched by a create or destroy from the UI resource
711 // request queue. 710 // request queue.
712 std::set<UIResourceId> evicted_ui_resources_; 711 std::set<UIResourceId> evicted_ui_resources_;
713 712
714 OutputSurface* output_surface_; 713 OutputSurface* output_surface_;
715 714
716 scoped_ptr<ResourceProvider> resource_provider_; 715 scoped_ptr<ResourceProvider> resource_provider_;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 bool resourceless_software_draw_; 797 bool resourceless_software_draw_;
799 798
800 gfx::Rect viewport_damage_rect_; 799 gfx::Rect viewport_damage_rect_;
801 800
802 scoped_ptr<AnimationRegistrar> animation_registrar_; 801 scoped_ptr<AnimationRegistrar> animation_registrar_;
803 scoped_ptr<AnimationHost> animation_host_; 802 scoped_ptr<AnimationHost> animation_host_;
804 std::set<VideoFrameController*> video_frame_controllers_; 803 std::set<VideoFrameController*> video_frame_controllers_;
805 804
806 // Map from scroll layer ID to scrollbar animation controller. 805 // Map from scroll layer ID to scrollbar animation controller.
807 // There is one animation controller per pair of overlay scrollbars. 806 // There is one animation controller per pair of overlay scrollbars.
808 base::ScopedPtrHashMap<int, scoped_ptr<ScrollbarAnimationController>> 807 std::unordered_map<int, scoped_ptr<ScrollbarAnimationController>>
809 scrollbar_animation_controllers_; 808 scrollbar_animation_controllers_;
810 809
811 RenderingStatsInstrumentation* rendering_stats_instrumentation_; 810 RenderingStatsInstrumentation* rendering_stats_instrumentation_;
812 MicroBenchmarkControllerImpl micro_benchmark_controller_; 811 MicroBenchmarkControllerImpl micro_benchmark_controller_;
813 scoped_ptr<SynchronousTaskGraphRunner> 812 scoped_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
(...skipping 10 matching lines...) Expand all
829 scoped_ptr<FrameTimingTracker> frame_timing_tracker_; 828 scoped_ptr<FrameTimingTracker> frame_timing_tracker_;
830 829
831 scoped_ptr<Viewport> viewport_; 830 scoped_ptr<Viewport> viewport_;
832 831
833 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 832 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
834 }; 833 };
835 834
836 } // namespace cc 835 } // namespace cc
837 836
838 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 837 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698