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

Side by Side Diff: cc/surfaces/surface_aggregator.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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/resources/layer_tiling_data.h ('k') | cc/surfaces/surface_factory.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SURFACES_SURFACE_AGGREGATOR_H_ 5 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_
6 #define CC_SURFACES_SURFACE_AGGREGATOR_H_ 6 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 const DelegatedFrameData* frame_data); 81 const DelegatedFrameData* frame_data);
82 int ChildIdForSurface(Surface* surface); 82 int ChildIdForSurface(Surface* surface);
83 gfx::Rect DamageRectForSurface(const Surface* surface, 83 gfx::Rect DamageRectForSurface(const Surface* surface,
84 const RenderPass& source, 84 const RenderPass& source,
85 const gfx::Rect& full_rect); 85 const gfx::Rect& full_rect);
86 86
87 SurfaceManager* manager_; 87 SurfaceManager* manager_;
88 ResourceProvider* provider_; 88 ResourceProvider* provider_;
89 89
90 class RenderPassIdAllocator; 90 class RenderPassIdAllocator;
91 typedef base::ScopedPtrHashMap<SurfaceId, RenderPassIdAllocator> 91 typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<RenderPassIdAllocator>>
92 RenderPassIdAllocatorMap; 92 RenderPassIdAllocatorMap;
93 RenderPassIdAllocatorMap render_pass_allocator_map_; 93 RenderPassIdAllocatorMap render_pass_allocator_map_;
94 int next_render_pass_id_; 94 int next_render_pass_id_;
95 95
96 typedef base::hash_map<SurfaceId, int> SurfaceToResourceChildIdMap; 96 typedef base::hash_map<SurfaceId, int> SurfaceToResourceChildIdMap;
97 SurfaceToResourceChildIdMap surface_id_to_resource_child_id_; 97 SurfaceToResourceChildIdMap surface_id_to_resource_child_id_;
98 98
99 // The following state is only valid for the duration of one Aggregate call 99 // The following state is only valid for the duration of one Aggregate call
100 // and is only stored on the class to avoid having to pass through every 100 // and is only stored on the class to avoid having to pass through every
101 // function call. 101 // function call.
(...skipping 13 matching lines...) Expand all
115 115
116 // Resource list for the aggregated frame. 116 // Resource list for the aggregated frame.
117 TransferableResourceArray* dest_resource_list_; 117 TransferableResourceArray* dest_resource_list_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator); 119 DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
120 }; 120 };
121 121
122 } // namespace cc 122 } // namespace cc
123 123
124 #endif // CC_SURFACES_SURFACE_AGGREGATOR_H_ 124 #endif // CC_SURFACES_SURFACE_AGGREGATOR_H_
OLDNEW
« no previous file with comments | « cc/resources/layer_tiling_data.h ('k') | cc/surfaces/surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698