| Index: cc/layers/layer_iterator_unittest.cc
|
| diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
|
| index cb2b5b1f44bb952772ee8746019812b8c34442d0..15567e4868269c46d723d7631b174a9eeaad7296 100644
|
| --- a/cc/layers/layer_iterator_unittest.cc
|
| +++ b/cc/layers/layer_iterator_unittest.cc
|
| @@ -50,15 +50,15 @@ class TestLayer : public Layer {
|
| EXPECT_EQ(itself, layer->count_representing_itself_);
|
|
|
| typedef LayerIterator<Layer,
|
| - std::vector<scoped_refptr<Layer> >,
|
| + LayerList,
|
| RenderSurface,
|
| LayerIteratorActions::FrontToBack> FrontToBack;
|
| typedef LayerIterator<Layer,
|
| - std::vector<scoped_refptr<Layer> >,
|
| + LayerList,
|
| RenderSurface,
|
| LayerIteratorActions::BackToFront> BackToFront;
|
|
|
| -void ResetCounts(std::vector<scoped_refptr<Layer> >* render_surface_layerList) {
|
| +void ResetCounts(LayerList* render_surface_layerList) {
|
| for (unsigned surface_index = 0;
|
| surface_index < render_surface_layerList->size();
|
| ++surface_index) {
|
| @@ -84,7 +84,7 @@ void ResetCounts(std::vector<scoped_refptr<Layer> >* render_surface_layerList) {
|
| }
|
|
|
| void IterateFrontToBack(
|
| - std::vector<scoped_refptr<Layer> >* render_surface_layerList) {
|
| + LayerList* render_surface_layerList) {
|
| ResetCounts(render_surface_layerList);
|
| int count = 0;
|
| for (FrontToBack it = FrontToBack::Begin(render_surface_layerList);
|
| @@ -101,7 +101,7 @@ void IterateFrontToBack(
|
| }
|
|
|
| void IterateBackToFront(
|
| - std::vector<scoped_refptr<Layer> >* render_surface_layerList) {
|
| + LayerList* render_surface_layerList) {
|
| ResetCounts(render_surface_layerList);
|
| int count = 0;
|
| for (BackToFront it = BackToFront::Begin(render_surface_layerList);
|
| @@ -118,7 +118,7 @@ void IterateBackToFront(
|
| }
|
|
|
| TEST(LayerIteratorTest, EmptyTree) {
|
| - std::vector<scoped_refptr<Layer> > render_surface_layerList;
|
| + LayerList render_surface_layerList;
|
|
|
| IterateBackToFront(&render_surface_layerList);
|
| IterateFrontToBack(&render_surface_layerList);
|
| @@ -138,7 +138,7 @@ TEST(LayerIteratorTest, SimpleTree) {
|
| root_layer->AddChild(third);
|
| root_layer->AddChild(fourth);
|
|
|
| - std::vector<scoped_refptr<Layer> > render_surface_layerList;
|
| + LayerList render_surface_layerList;
|
| LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
|
| root_layer->bounds(),
|
| 1,
|
| @@ -184,7 +184,7 @@ TEST(LayerIteratorTest, ComplexTree) {
|
| root22->AddChild(root221);
|
| root23->AddChild(root231);
|
|
|
| - std::vector<scoped_refptr<Layer> > render_surface_layerList;
|
| + LayerList render_surface_layerList;
|
| LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
|
| root_layer->bounds(),
|
| 1,
|
| @@ -245,7 +245,7 @@ TEST(LayerIteratorTest, ComplexTreeMultiSurface) {
|
| root23->SetOpacity(0.5f);
|
| root23->AddChild(root231);
|
|
|
| - std::vector<scoped_refptr<Layer> > render_surface_layerList;
|
| + LayerList render_surface_layerList;
|
| LayerTreeHostCommon::CalculateDrawProperties(root_layer.get(),
|
| root_layer->bounds(),
|
| 1,
|
|
|