cc: Replace LayerIterator with iterator that walks layer list and effect tree

cc/trees/occlusion_tracker_unittest.cc

 // Copyright 2012 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 <stddef.h>
 
 #include "cc/animation/animation_host.h"
 #include "cc/base/filter_operation.h"
@@ skipping 172 matching lines @@
     TestContentLayerImpl* layer =
         CreateDrawingLayer(parent, transform, position, bounds, opaque);
     layer->test_properties()->force_render_surface = true;
     return layer;
   }
 
   void DestroyLayers() {
     host_->host_impl()->active_tree()->SetRootLayerForTesting(nullptr);
     render_surface_layer_list_impl_.clear();
     mask_layers_.clear();
-    ResetLayerIterator();
+    layer_iterator_.reset();
   }
 
   void CopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}
 
   void AddCopyRequest(Layer* layer) {
     layer->RequestCopyOfOutput(CopyOutputRequest::CreateBitmapRequest(
         base::Bind(&OcclusionTrackerTest::CopyOutputCallback,
                    base::Unretained(this))));
   }
 
@@ skipping 12 matching lines @@
     // iterations, so rebuild property trees every time.
     root->layer_tree_impl()->property_trees()->needs_rebuild = true;
 
     FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(root);
 
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
         root, root->bounds(), &render_surface_layer_list_impl_);
     inputs.can_adjust_raster_scales = true;
     LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
-    layer_iterator_ = layer_iterator_begin_ =
-        LayerIterator::Begin(&render_surface_layer_list_impl_);
+    layer_iterator_ = base::MakeUnique<EffectTreeLayerListIterator>(
+        host_->host_impl()->active_tree());
   }
 
   void EnterLayer(LayerImpl* layer, OcclusionTracker* occlusion) {
-    ASSERT_EQ(*layer_iterator_, layer);
-    ASSERT_TRUE(layer_iterator_.represents_itself());
-    occlusion->EnterLayer(layer_iterator_);
+    ASSERT_EQ(layer_iterator_->current_layer(), layer);
+    ASSERT_TRUE(layer_iterator_->state() ==
+                EffectTreeLayerListIterator::State::LAYER);
+    occlusion->EnterLayer(*layer_iterator_);
   }
 
   void LeaveLayer(LayerImpl* layer, OcclusionTracker* occlusion) {
-    ASSERT_EQ(*layer_iterator_, layer);
-    ASSERT_TRUE(layer_iterator_.represents_itself());
-    occlusion->LeaveLayer(layer_iterator_);
-    ++layer_iterator_;
+    ASSERT_EQ(layer_iterator_->current_layer(), layer);
+    ASSERT_TRUE(layer_iterator_->state() ==
+                EffectTreeLayerListIterator::State::LAYER);
+    occlusion->LeaveLayer(*layer_iterator_);
+    ++(*layer_iterator_);
   }
 
   void VisitLayer(LayerImpl* layer, OcclusionTracker* occlusion) {
     EnterLayer(layer, occlusion);
     LeaveLayer(layer, occlusion);
   }
 
   void EnterContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
-    ASSERT_EQ(*layer_iterator_, layer);
-    ASSERT_TRUE(layer_iterator_.represents_target_render_surface());
-    occlusion->EnterLayer(layer_iterator_);
-    occlusion->LeaveLayer(layer_iterator_);
-    ++layer_iterator_;
-    ASSERT_TRUE(layer_iterator_.represents_contributing_render_surface());
-    occlusion->EnterLayer(layer_iterator_);
+    ASSERT_EQ(layer_iterator_->target_render_surface(),
+              layer->GetRenderSurface());
+    ASSERT_TRUE(layer_iterator_->state() ==
+                EffectTreeLayerListIterator::State::TARGET_SURFACE);
+    occlusion->EnterLayer(*layer_iterator_);
+    occlusion->LeaveLayer(*layer_iterator_);
+    ++(*layer_iterator_);
+    ASSERT_TRUE(layer_iterator_->state() ==
+                EffectTreeLayerListIterator::State::CONTRIBUTING_SURFACE);
+    occlusion->EnterLayer(*layer_iterator_);
   }
 
   void LeaveContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
-    ASSERT_EQ(*layer_iterator_, layer);
-    ASSERT_TRUE(layer_iterator_.represents_contributing_render_surface());
-    occlusion->LeaveLayer(layer_iterator_);
-    ++layer_iterator_;
+    ASSERT_EQ(layer_iterator_->current_render_surface(),
+              layer->GetRenderSurface());
+    ASSERT_TRUE(layer_iterator_->state() ==
+                EffectTreeLayerListIterator::State::CONTRIBUTING_SURFACE);
+    occlusion->LeaveLayer(*layer_iterator_);
+    ++(*layer_iterator_);
   }
 
   void VisitContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
     EnterContributingSurface(layer, occlusion);
     LeaveContributingSurface(layer, occlusion);
   }
 
-  void ResetLayerIterator() { layer_iterator_ = layer_iterator_begin_; }
+  void ResetLayerIterator() {
+    *layer_iterator_ =
+        EffectTreeLayerListIterator(host_->host_impl()->active_tree());
+  }
 
   const gfx::Transform identity_matrix;
 
  private:
   void SetRootLayerOnMainThread(Layer* root) {
     host_->SetRootLayer(scoped_refptr<Layer>(root));
   }
 
   void SetRootLayerOnMainThread(LayerImpl* root) {}
 
@@ skipping 10 matching lines @@
     owning_layer->test_properties()->SetMaskLayer(std::move(layer));
   }
 
   bool opaque_layers_;
   FakeLayerTreeHostClient client_;
   TestTaskGraphRunner task_graph_runner_;
   std::unique_ptr<AnimationHost> animation_host_;
   std::unique_ptr<FakeLayerTreeHost> host_;
   // These hold ownership of the layers for the duration of the test.
   LayerImplList render_surface_layer_list_impl_;
-  LayerIterator layer_iterator_begin_;
-  LayerIterator layer_iterator_;
+  std::unique_ptr<EffectTreeLayerListIterator> layer_iterator_;
   LayerList mask_layers_;
   int next_layer_impl_id_;
 };
 
 #define RUN_TEST_IMPL_THREAD_OPAQUE_LAYERS(ClassName)          \
   class ClassName##ImplThreadOpaqueLayers : public ClassName { \
    public: /* NOLINT(whitespace/indent) */                     \
     ClassName##ImplThreadOpaqueLayers() : ClassName(true) {}   \
   };                                                           \
   TEST_F(ClassName##ImplThreadOpaqueLayers, RunTest) { RunMyTest(); }
@@ skipping 2112 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc