cc: De-special-case SurfaceLayer code

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 90 matching lines @@
   // We are going to set up the SurfaceLayers and LayerTreeHosts. Each layer
   // will require a sequence and no sequence should be satisfied for now.
   EXPECT_CALL(*ref_factory, RequireSequence(Eq(expected_id), Eq(expected_seq1)))
       .Times(1);
   EXPECT_CALL(*ref_factory, RequireSequence(Eq(expected_id), Eq(expected_seq2)))
       .Times(1);
   EXPECT_CALL(*ref_factory, SatisfySequence(_)).Times(0);
 
   auto layer = SurfaceLayer::Create(ref_factory);
   layer->SetPrimarySurfaceInfo(info);
+  layer->SetFallbackSurfaceInfo(info);
   layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id(
       FrameSinkId(1, 1));
   layer_tree_host_->SetRootLayer(layer);
 
   auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
       FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_,
                                 animation_host2.get());
   auto layer2 = SurfaceLayer::Create(ref_factory);
   layer2->SetPrimarySurfaceInfo(info);
+  layer2->SetFallbackSurfaceInfo(info);
   layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id(
       FrameSinkId(2, 2));
   layer_tree_host2->SetRootLayer(layer2);
 
   testing::Mock::VerifyAndClearExpectations(ref_factory.get());
 
   // Destroy the second LayerTreeHost. The sequence generated by its
   // SurfaceLayer must be satisfied and no new sequences must be required.
   EXPECT_CALL(*ref_factory, SatisfySequence(Eq(expected_seq2))).Times(1);
   layer_tree_host2->SetRootLayer(nullptr);
@@ skipping 20 matching lines @@
   scoped_refptr<SurfaceReferenceFactory> ref_factory =
       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);
+  layer->SetFallbackSurfaceInfo(primary_info);
 
-  // As surface synchronization is not enabled, the primary surface id should
-  // be recorded on the layer tree host.
-  EXPECT_FALSE(layer_tree_host_->GetSettings().enable_surface_synchronization);
   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());
   TreeSynchronizer::PushLayerProperties(layer_tree_host_.get(),
                                         host_impl_.pending_tree());
   layer_tree_host_->PushSurfaceIdsTo(host_impl_.pending_tree());
 
   // Verify that pending tree received the 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.
+  // Verify that the primary and fallback SurfaceInfos are pushed through.
   EXPECT_EQ(primary_info, layer_impl->primary_surface_info());
-  EXPECT_EQ(SurfaceInfo(), layer_impl->fallback_surface_info());
+  EXPECT_EQ(primary_info, 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);
 
   // Verify that fallback surface id is not recorded on the layer tree host as
   // surface synchronization is not enabled.
-  EXPECT_FALSE(layer_tree_host_->needs_surface_ids_sync());
+  EXPECT_TRUE(layer_tree_host_->needs_surface_ids_sync());
   EXPECT_EQ(layer_tree_host_->SurfaceLayerIds().size(), 1u);
 
   TreeSynchronizer::PushLayerProperties(layer_tree_host_.get(),
                                         host_impl_.pending_tree());
   layer_tree_host_->PushSurfaceIdsTo(host_impl_.pending_tree());
 
   EXPECT_EQ(host_impl_.pending_tree()->SurfaceLayerIds().size(), 1u);
 
   // Verify that the primary SurfaceInfo stays the same and the new fallback
   // SurfaceInfo is pushed through.
@@ skipping 14 matching lines @@
 
     // Create a SurfaceLayer but don't add it to the tree yet. No sequence
     // should be required / satisfied.
     EXPECT_CALL(*ref_factory_, SatisfySequence(_)).Times(0);
     EXPECT_CALL(*ref_factory_, RequireSequence(_, _)).Times(0);
     layer_ = SurfaceLayer::Create(ref_factory_);
     SurfaceInfo info(
         SurfaceId(kArbitraryFrameSinkId, LocalSurfaceId(1, kArbitraryToken)),
         1.f, gfx::Size(1, 1));
     layer_->SetPrimarySurfaceInfo(info);
+    layer_->SetFallbackSurfaceInfo(info);
     testing::Mock::VerifyAndClearExpectations(ref_factory_.get());
 
     // Add the layer to the tree. A sequence must be required.
     SurfaceSequence expected_seq(kArbitraryFrameSinkId, 1u);
     SurfaceId expected_id(kArbitraryFrameSinkId,
                           LocalSurfaceId(1, kArbitraryToken));
     EXPECT_CALL(*ref_factory_, SatisfySequence(_)).Times(0);
     EXPECT_CALL(*ref_factory_,
                 RequireSequence(Eq(expected_id), Eq(expected_seq)))
         .Times(1);
@@ skipping 84 matching lines @@
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
 
 }  // namespace
 }  // namespace cc