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

Unified Diff: cc/trees/occlusion_tracker_unittest.cc

Issue 13285002: cc: Consolidate LayerList types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/occlusion_tracker.cc ('k') | cc/trees/quad_culler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/occlusion_tracker_unittest.cc
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 8d6477b5fc61d6983f73d460af0fdc3ef780d09f..9741d634036fe228d7455cbccff84b91b2071293 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -136,7 +136,7 @@ struct OcclusionTrackerTestMainThreadTypes {
typedef scoped_refptr<Layer> LayerPtrType;
typedef scoped_refptr<ContentLayerType> ContentLayerPtrType;
typedef LayerIterator<Layer,
- std::vector<scoped_refptr<Layer> >,
+ LayerList,
RenderSurface,
LayerIteratorActions::FrontToBack> TestLayerIterator;
typedef OcclusionTracker OcclusionTrackerType;
@@ -169,7 +169,7 @@ struct OcclusionTrackerTestImplThreadTypes {
typedef scoped_ptr<LayerImpl> LayerPtrType;
typedef scoped_ptr<ContentLayerType> ContentLayerPtrType;
typedef LayerIterator<LayerImpl,
- std::vector<LayerImpl*>,
+ LayerImplList,
RenderSurfaceImpl,
LayerIteratorActions::FrontToBack> TestLayerIterator;
typedef OcclusionTrackerImpl OcclusionTrackerType;
@@ -449,13 +449,13 @@ template <typename Types> class OcclusionTrackerTest : public testing::Test {
bool opaque_layers_;
// These hold ownership of the layers for the duration of the test.
typename Types::LayerPtrType root_;
- std::vector<scoped_refptr<Layer> > render_surface_layer_list_;
- std::vector<LayerImpl*> render_surface_layer_list_impl_;
+ LayerList render_surface_layer_list_;
+ LayerImplList render_surface_layer_list_impl_;
typename Types::TestLayerIterator layer_iterator_begin_;
typename Types::TestLayerIterator layer_iterator_;
typename Types::LayerType* last_layer_visited_;
- std::vector<scoped_refptr<Layer> > replica_layers_;
- std::vector<scoped_refptr<Layer> > mask_layers_;
+ LayerList replica_layers_;
+ LayerList mask_layers_;
};
template <>
« no previous file with comments | « cc/trees/occlusion_tracker.cc ('k') | cc/trees/quad_culler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698