Surface Synchronization: Distinguish between dependencies and references

cc/layers/surface_layer_impl_unittest.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/layers/surface_layer_impl.h"
 
 #include <stddef.h>
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/test/layer_test_common.h"
@@ skipping 222 matching lines @@
   surface_layer_impl->SetDrawsContent(true);
   surface_layer_impl->SetPrimarySurfaceInfo(primary_surface_info);
   surface_layer_impl->SetFallbackSurfaceInfo(fallback_surface_info);
 
   gfx::Size viewport_size(1000, 1000);
   impl.CalcDrawProps(viewport_size);
 
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
   AppendQuadsData data;
   surface_layer_impl->AppendQuads(render_pass.get(), &data);
-  EXPECT_THAT(data.embedded_surfaces,
-              UnorderedElementsAre(surface_id1, surface_id2));
+  // The the primary SurfaceInfo will be added to embedded_surfaces.
+  EXPECT_THAT(data.embedded_surfaces, UnorderedElementsAre(surface_id1));
 
   ASSERT_EQ(2u, render_pass->quad_list.size());
   const SurfaceDrawQuad* surface_draw_quad1 =
       SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(0));
   ASSERT_TRUE(surface_draw_quad1);
   const SurfaceDrawQuad* surface_draw_quad2 =
       SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(1));
   ASSERT_TRUE(surface_draw_quad2);
 
   EXPECT_EQ(SurfaceDrawQuadType::PRIMARY,
@@ skipping 45 matching lines @@
   ASSERT_TRUE(surface_draw_quad1);
 
   EXPECT_EQ(SurfaceDrawQuadType::PRIMARY,
             surface_draw_quad1->surface_draw_quad_type);
   EXPECT_EQ(surface_id1, surface_draw_quad1->surface_id);
   EXPECT_FALSE(surface_draw_quad1->fallback_quad);
 }
 
 }  // namespace
 }  // namespace cc