Revert "Revert 253606 "Revert 251238 "cc: Clean up iterator template to ...""

cc/trees/occlusion_tracker_perftest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/occlusion_tracker.h"
 
 #include "base/time/time.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/test/fake_layer_tree_host_impl_client.h"
@@ skipping 73 matching lines @@
   opaque_layer->SetDrawsContent(true);
   opaque_layer->SetBounds(viewport_rect.size());
   opaque_layer->SetContentBounds(viewport_rect.size());
   active_tree()->root_layer()->AddChild(opaque_layer.PassAs<LayerImpl>());
 
   active_tree()->UpdateDrawProperties();
   const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList();
   ASSERT_EQ(1u, rsll.size());
   EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size());
 
-  LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
-  LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
+  typedef LayerIterator<LayerImpl,
+                        LayerImpl::LayerListType,
+                        LayerImpl::RenderSurfaceType,
+                        LayerIteratorActions::FrontToBack> IteratorType;
+  IteratorType begin = IteratorType::Begin(&rsll);
+  IteratorType end = IteratorType::End(&rsll);
 
   LayerIteratorPosition<LayerImpl> pos = begin;
 
   // The opaque_layer adds occlusion over the whole viewport.
   tracker.EnterLayer(pos);
   tracker.LeaveLayer(pos);
 
   gfx::Transform transform_to_target;
   transform_to_target.Translate(0, 96);
   bool impl_draw_transform_is_unknown = false;
@@ skipping 53 matching lines @@
     opaque_layer->SetPosition(gfx::Point(i, i));
     active_tree()->root_layer()->AddChild(opaque_layer.PassAs<LayerImpl>());
   }
 
   active_tree()->UpdateDrawProperties();
   const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList();
   ASSERT_EQ(1u, rsll.size());
   EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers),
             rsll[0]->render_surface()->layer_list().size());
 
-  LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
-  LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
+  typedef LayerIterator<LayerImpl,
+                        LayerImpl::LayerListType,
+                        LayerImpl::RenderSurfaceType,
+                        LayerIteratorActions::FrontToBack> IteratorType;
+  IteratorType begin = IteratorType::Begin(&rsll);
+  IteratorType end = IteratorType::End(&rsll);
 
   // The opaque_layers add occlusion.
   for (int i = 0; i < kNumOpaqueLayers - 1; ++i) {
     LayerIteratorPosition<LayerImpl> pos = begin;
     tracker.EnterLayer(pos);
     tracker.LeaveLayer(pos);
     ++begin;
   }
   LayerIteratorPosition<LayerImpl> pos = begin;
   tracker.EnterLayer(pos);
@@ skipping 23 matching lines @@
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc