cc : Store surface layer ids on LayerTreeHost and push them at commit

cc/layers/surface_layer_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 <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 141 matching lines @@
       new testing::NiceMock<MockSurfaceReferenceFactory>();
 
   scoped_refptr<SurfaceLayer> layer = SurfaceLayer::Create(ref_factory);
   layer_tree_host_->SetRootLayer(layer);
   SurfaceInfo primary_info(
       SurfaceId(kArbitraryFrameSinkId,
                 LocalSurfaceId(1, base::UnguessableToken::Create())),
       1.f, gfx::Size(1, 1));
   layer->SetPrimarySurfaceInfo(primary_info);
 
+  // Verify that the primary surface id is recorded on the layer tree host and
+  // needs to be pushed.
+  EXPECT_TRUE(layer_tree_host_->needs_surface_ids_sync());
+  EXPECT_EQ(layer_tree_host_->SurfaceLayerIds().size(), 1u);
+
+  // Verify that pending tree has no surface ids already.
+  EXPECT_FALSE(host_impl_.pending_tree()->needs_surface_ids_sync());
+  EXPECT_EQ(host_impl_.pending_tree()->SurfaceLayerIds().size(), 0u);
+
   std::unique_ptr<SurfaceLayerImpl> layer_impl =
       SurfaceLayerImpl::Create(host_impl_.pending_tree(), layer->id());
-  layer->PushPropertiesTo(layer_impl.get());
+  TreeSynchronizer::PushLayerProperties(layer_tree_host_.get(),
+                                        host_impl_.pending_tree());
+  layer_tree_host_->PushSurfaceIdsTo(host_impl_.pending_tree());
 
-  // Verify tha the primary SurfaceInfo is pushed through and that there is
+  // Verify that pending tree received the primary surface id and also has
+  // needs_surface_ids_sync set to true as it needs to sync with active tree.
+  EXPECT_TRUE(host_impl_.pending_tree()->needs_surface_ids_sync());
+  EXPECT_EQ(host_impl_.pending_tree()->SurfaceLayerIds().size(), 1u);
+
+  // Verify we have reset the state on layer tree host.
+  EXPECT_FALSE(layer_tree_host_->needs_surface_ids_sync());
+
+  // Verify that the primary SurfaceInfo is pushed through and that there is
   // no valid fallback SurfaceInfo.
   EXPECT_EQ(primary_info, layer_impl->primary_surface_info());
   EXPECT_EQ(SurfaceInfo(), layer_impl->fallback_surface_info());
 
   SurfaceInfo fallback_info(
       SurfaceId(kArbitraryFrameSinkId,
                 LocalSurfaceId(2, base::UnguessableToken::Create())),
       2.f, gfx::Size(10, 10));
   layer->SetFallbackSurfaceInfo(fallback_info);
-  layer->PushPropertiesTo(layer_impl.get());
+
+  // Verify that fallback surface id is recorded on the layer tree host and need
+  // to be pushed.
+  EXPECT_TRUE(layer_tree_host_->needs_surface_ids_sync());
+  EXPECT_EQ(layer_tree_host_->SurfaceLayerIds().size(), 2u);
+
+  // Verify that pending tree has only primary surface id.
+  EXPECT_EQ(host_impl_.pending_tree()->SurfaceLayerIds().size(), 1u);
+
+  TreeSynchronizer::PushLayerProperties(layer_tree_host_.get(),
+                                        host_impl_.pending_tree());
+  layer_tree_host_->PushSurfaceIdsTo(host_impl_.pending_tree());
+
+  // Verify that pending tree received the fallback surface id and also has
+  // needs_surface_ids_sync set to true as it needs to sync with active tree.
+  EXPECT_TRUE(host_impl_.pending_tree()->needs_surface_ids_sync());
+  EXPECT_EQ(host_impl_.pending_tree()->SurfaceLayerIds().size(), 2u);
+
+  // Verify we have reset the state on layer tree host.
+  EXPECT_FALSE(layer_tree_host_->needs_surface_ids_sync());
 
   // Verify that the primary SurfaceInfo stays the same and the new fallback
   // SurfaceInfo is pushed through.
   EXPECT_EQ(primary_info, layer_impl->primary_surface_info());
   EXPECT_EQ(fallback_info, layer_impl->fallback_surface_info());
 }
 
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromise : public LayerTreeTest {
  public:
@@ skipping 111 matching lines @@
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
 
 }  // namespace
 }  // namespace cc