cc: Remove LayerTreeHostImpl::FrameData::render_passes_by_id.

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 8646 matching lines @@
   // Really we just need at least one client notification each time
   // we go from having a valid output surface to not having a valid output
   // surface.
   EXPECT_EQ(0, num_lost_surfaces_);
   host_impl_->DidLoseOutputSurface();
   EXPECT_EQ(1, num_lost_surfaces_);
   host_impl_->DidLoseOutputSurface();
   EXPECT_LE(1, num_lost_surfaces_);
 }
 
+size_t CountRenderPassesWithId(const RenderPassList& list, RenderPassId id) {
+  return std::count_if(list.begin(), list.end(),
+                       [id](const RenderPass* p) { return p->id == id; });
+}
+
 TEST_F(LayerTreeHostImplTest, RemoveUnreferencedRenderPass) {
   LayerTreeHostImpl::FrameData frame;
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass3 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass2 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass1 = frame.render_passes.back();
 
   pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
-  frame.render_passes_by_id[pass1->id] = pass1;
-  frame.render_passes_by_id[pass2->id] = pass2;
-  frame.render_passes_by_id[pass3->id] = pass3;
-
   // Add a quad to each pass so they aren't empty.
   SolidColorDrawQuad* color_quad;
   color_quad = pass1->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   color_quad->material = DrawQuad::SOLID_COLOR;
   color_quad = pass2->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   color_quad->material = DrawQuad::SOLID_COLOR;
   color_quad = pass3->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   color_quad->material = DrawQuad::SOLID_COLOR;
 
   // pass3 is referenced by pass2.
   RenderPassDrawQuad* rpdq =
       pass2->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   rpdq->material = DrawQuad::RENDER_PASS;
   rpdq->render_pass_id = pass3->id;
 
   // But pass2 is not referenced by pass1. So pass2 and pass3 should be culled.
   FakeLayerTreeHostImpl::RemoveRenderPasses(&frame);
-  EXPECT_EQ(1u, frame.render_passes_by_id.size());
-  EXPECT_TRUE(frame.render_passes_by_id[RenderPassId(1, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(2, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(3, 0)]);
   EXPECT_EQ(1u, frame.render_passes.size());
+  EXPECT_EQ(1u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(1, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(2, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(3, 0)));
   EXPECT_EQ(RenderPassId(1, 0), frame.render_passes[0]->id);
 }
 
 TEST_F(LayerTreeHostImplTest, RemoveEmptyRenderPass) {
   LayerTreeHostImpl::FrameData frame;
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass3 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass2 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass1 = frame.render_passes.back();
 
   pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
-  frame.render_passes_by_id[pass1->id] = pass1;
-  frame.render_passes_by_id[pass2->id] = pass2;
-  frame.render_passes_by_id[pass3->id] = pass3;
-
   // pass1 is not empty, but pass2 and pass3 are.
   SolidColorDrawQuad* color_quad;
   color_quad = pass1->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   color_quad->material = DrawQuad::SOLID_COLOR;
 
   // pass3 is referenced by pass2.
   RenderPassDrawQuad* rpdq =
       pass2->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   rpdq->material = DrawQuad::RENDER_PASS;
   rpdq->render_pass_id = pass3->id;
 
   // pass2 is referenced by pass1.
   rpdq = pass1->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   rpdq->material = DrawQuad::RENDER_PASS;
   rpdq->render_pass_id = pass2->id;
 
   // Since pass3 is empty it should be removed. Then pass2 is empty too, and
   // should be removed.
   FakeLayerTreeHostImpl::RemoveRenderPasses(&frame);
-  EXPECT_EQ(1u, frame.render_passes_by_id.size());
-  EXPECT_TRUE(frame.render_passes_by_id[RenderPassId(1, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(2, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(3, 0)]);
   EXPECT_EQ(1u, frame.render_passes.size());
+  EXPECT_EQ(1u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(1, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(2, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(3, 0)));
   EXPECT_EQ(RenderPassId(1, 0), frame.render_passes[0]->id);
   // The RenderPassDrawQuad should be removed from pass1.
   EXPECT_EQ(1u, pass1->quad_list.size());
   EXPECT_EQ(DrawQuad::SOLID_COLOR, pass1->quad_list.ElementAt(0)->material);
 }
 
 TEST_F(LayerTreeHostImplTest, DoNotRemoveEmptyRootRenderPass) {
   LayerTreeHostImpl::FrameData frame;
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass3 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass2 = frame.render_passes.back();
   frame.render_passes.push_back(RenderPass::Create());
   RenderPass* pass1 = frame.render_passes.back();
 
   pass1->SetNew(RenderPassId(1, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass2->SetNew(RenderPassId(2, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
   pass3->SetNew(RenderPassId(3, 0), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
-  frame.render_passes_by_id[pass1->id] = pass1;
-  frame.render_passes_by_id[pass2->id] = pass2;
-  frame.render_passes_by_id[pass3->id] = pass3;
-
   // pass3 is referenced by pass2.
   RenderPassDrawQuad* rpdq =
       pass2->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   rpdq->material = DrawQuad::RENDER_PASS;
   rpdq->render_pass_id = pass3->id;
 
   // pass2 is referenced by pass1.
   rpdq = pass1->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   rpdq->material = DrawQuad::RENDER_PASS;
   rpdq->render_pass_id = pass2->id;
 
   // Since pass3 is empty it should be removed. Then pass2 is empty too, and
   // should be removed. Then pass1 is empty too, but it's the root so it should
   // not be removed.
   FakeLayerTreeHostImpl::RemoveRenderPasses(&frame);
-  EXPECT_EQ(1u, frame.render_passes_by_id.size());
-  EXPECT_TRUE(frame.render_passes_by_id[RenderPassId(1, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(2, 0)]);
-  EXPECT_FALSE(frame.render_passes_by_id[RenderPassId(3, 0)]);
   EXPECT_EQ(1u, frame.render_passes.size());
+  EXPECT_EQ(1u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(1, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(2, 0)));
+  EXPECT_EQ(0u,
+            CountRenderPassesWithId(frame.render_passes, RenderPassId(3, 0)));
   EXPECT_EQ(RenderPassId(1, 0), frame.render_passes[0]->id);
   // The RenderPassDrawQuad should be removed from pass1.
   EXPECT_EQ(0u, pass1->quad_list.size());
 }
 
 class FakeVideoFrameController : public VideoFrameController {
  public:
   void OnBeginFrame(const BeginFrameArgs& args) override {
     begin_frame_args_ = args;
     did_draw_frame_ = false;
@@ skipping 215 matching lines @@
   host_impl_->active_tree()->SetPageScaleOnActiveTree(2.f);
   DrawFrame();
   in_subtree_of_page_scale_layer = host_impl_->active_tree()->LayerById(100);
   node = host_impl_->active_tree()->property_trees()->transform_tree.Node(
       in_subtree_of_page_scale_layer->transform_tree_index());
   EXPECT_EQ(node->data.sublayer_scale, gfx::Vector2dF(2.f, 2.f));
 }
 
 }  // namespace
 }  // namespace cc