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

Unified Diff: cc/trees/quad_culler_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_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/quad_culler_unittest.cc
diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc
index c2835d36e52e90b23ac468db874e9ea9a2ac0269..b0575f40f098293e343d6d306d4af7c6c1780134 100644
--- a/cc/trees/quad_culler_unittest.cc
+++ b/cc/trees/quad_culler_unittest.cc
@@ -9,6 +9,7 @@
#include "cc/base/math_util.h"
#include "cc/debug/overdraw_metrics.h"
#include "cc/layers/append_quads_data.h"
+#include "cc/layers/render_surface_impl.h"
#include "cc/layers/tiled_layer_impl.h"
#include "cc/quads/tile_draw_quad.h"
#include "cc/resources/layer_tiling_data.h"
@@ -43,7 +44,7 @@ class TestOcclusionTrackerImpl : public OcclusionTrackerImpl {
};
typedef LayerIterator<LayerImpl,
- std::vector<LayerImpl*>,
+ LayerImplList,
RenderSurfaceImpl,
LayerIteratorActions::FrontToBack> LayerIteratorType;
@@ -60,7 +61,7 @@ class QuadCullerTest : public testing::Test {
float opacity,
bool opaque,
gfx::Rect layer_opaque_rect,
- std::vector<LayerImpl*>& surface_layer_list) {
+ LayerImplList& surface_layer_list) {
scoped_ptr<TiledLayerImpl> layer =
TiledLayerImpl::Create(host_impl_.active_tree(), layer_id_++);
scoped_ptr<LayerTilingData> tiler = LayerTilingData::Create(
@@ -131,7 +132,7 @@ class QuadCullerTest : public testing::Test {
#define DECLARE_AND_INITIALIZE_TEST_QUADS() \
QuadList quad_list; \
SharedQuadStateList shared_state_list; \
- std::vector<LayerImpl*> render_surface_layer_list; \
+ LayerImplList render_surface_layer_list; \
gfx::Transform child_transform; \
gfx::Size root_size = gfx::Size(300, 300); \
gfx::Rect root_rect = gfx::Rect(root_size); \
« no previous file with comments | « cc/trees/occlusion_tracker_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698