cc: De-special-case SurfaceLayer code

cc/layers/surface_layer.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.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 45 matching lines @@
   return make_scoped_refptr(new SurfaceLayer(std::move(ref_factory)));
 }
 
 SurfaceLayer::SurfaceLayer(scoped_refptr<SurfaceReferenceFactory> ref_factory)
     : ref_factory_(std::move(ref_factory)) {}
 
 SurfaceLayer::~SurfaceLayer() {
   DCHECK(!layer_tree_host());
 }
 
-void SurfaceLayer::AddReferencedSurfaceId(const SurfaceInfo& surface_info) {
-  DCHECK(layer_tree_host());
-  if (surface_info.is_valid())
-    layer_tree_host()->AddSurfaceLayerId(surface_info.id());
-}
-
-void SurfaceLayer::RemoveReferencedSurfaceId(const SurfaceInfo& surface_info) {
-  DCHECK(layer_tree_host());
-  if (surface_info.is_valid())
-    layer_tree_host()->RemoveSurfaceLayerId(surface_info.id());
-}
-
 void SurfaceLayer::SetPrimarySurfaceInfo(const SurfaceInfo& surface_info) {
-  RemoveReference(std::move(primary_reference_returner_));
-  bool update_referenced_surface_id = false;
-  if (layer_tree_host())
-    update_referenced_surface_id =
-        !layer_tree_host()->GetSettings().enable_surface_synchronization;
-  if (update_referenced_surface_id)
-    RemoveReferencedSurfaceId(primary_surface_info_);
   primary_surface_info_ = surface_info;
-  if (layer_tree_host()) {
-    primary_reference_returner_ = ref_factory_->CreateReference(
-        layer_tree_host(), primary_surface_info_.id());
-    if (update_referenced_surface_id)
-      AddReferencedSurfaceId(primary_surface_info_);
-  }
   UpdateDrawsContent(HasDrawableContent());
   SetNeedsCommit();
 }
 
 void SurfaceLayer::SetFallbackSurfaceInfo(const SurfaceInfo& surface_info) {
   RemoveReference(std::move(fallback_reference_returner_));
-  bool update_referenced_surface_id = false;
   if (layer_tree_host())
-    update_referenced_surface_id =
-        layer_tree_host()->GetSettings().enable_surface_synchronization;
-  if (update_referenced_surface_id)
-    RemoveReferencedSurfaceId(fallback_surface_info_);
+    layer_tree_host()->RemoveSurfaceLayerId(fallback_surface_info_.id());
+
   fallback_surface_info_ = surface_info;
-  if (layer_tree_host()) {
+
+  if (layer_tree_host() && fallback_surface_info_.is_valid()) {
     fallback_reference_returner_ = ref_factory_->CreateReference(
         layer_tree_host(), fallback_surface_info_.id());
-    if (update_referenced_surface_id)
-      AddReferencedSurfaceId(fallback_surface_info_);
+    layer_tree_host()->AddSurfaceLayerId(fallback_surface_info_.id());
   }
   SetNeedsCommit();
 }
 
 void SurfaceLayer::SetStretchContentToFillBounds(
     bool stretch_content_to_fill_bounds) {
   stretch_content_to_fill_bounds_ = stretch_content_to_fill_bounds;
   SetNeedsPushProperties();
 }
 
 std::unique_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return SurfaceLayerImpl::Create(tree_impl, id());
 }
 
 bool SurfaceLayer::HasDrawableContent() const {
   return primary_surface_info_.is_valid() && Layer::HasDrawableContent();
 }
 
 void SurfaceLayer::SetLayerTreeHost(LayerTreeHost* host) {
   if (layer_tree_host() == host) {
     return;
   }
 
-  bool use_primary_info_for_referenced_surface_id = false;
-  if (layer_tree_host()) {
-    use_primary_info_for_referenced_surface_id =
-        !layer_tree_host()->GetSettings().enable_surface_synchronization;
-  } else if (host) {
-    use_primary_info_for_referenced_surface_id =
-        !host->GetSettings().enable_surface_synchronization;
-  }
+  if (layer_tree_host() && fallback_surface_info_.is_valid())
+    layer_tree_host()->RemoveSurfaceLayerId(fallback_surface_info_.id());
 
-  if (layer_tree_host()) {
-    if (use_primary_info_for_referenced_surface_id)
-      RemoveReferencedSurfaceId(primary_surface_info_);
-    else
-      RemoveReferencedSurfaceId(fallback_surface_info_);
-  }
-
-  RemoveReference(std::move(primary_reference_returner_));
   RemoveReference(std::move(fallback_reference_returner_));
   Layer::SetLayerTreeHost(host);
 
-  if (layer_tree_host()) {
-    if (primary_surface_info_.is_valid()) {
-      primary_reference_returner_ = ref_factory_->CreateReference(
-          layer_tree_host(), primary_surface_info_.id());
-    }
-    if (fallback_surface_info_.is_valid()) {
-      fallback_reference_returner_ = ref_factory_->CreateReference(
-          layer_tree_host(), fallback_surface_info_.id());
-    }
-    if (use_primary_info_for_referenced_surface_id)
-      AddReferencedSurfaceId(primary_surface_info_);
-    else
-      AddReferencedSurfaceId(fallback_surface_info_);
+  if (layer_tree_host() && fallback_surface_info_.is_valid()) {
+    fallback_reference_returner_ = ref_factory_->CreateReference(
+        layer_tree_host(), fallback_surface_info_.id());
+    layer_tree_host()->AddSurfaceLayerId(fallback_surface_info_.id());
   }
 }
 
 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo");
   SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
   layer_impl->SetPrimarySurfaceInfo(primary_surface_info_);
   layer_impl->SetFallbackSurfaceInfo(fallback_surface_info_);
   layer_impl->SetStretchContentToFillBounds(stretch_content_to_fill_bounds_);
 }
 
 void SurfaceLayer::RemoveReference(base::Closure reference_returner) {
   if (!reference_returner)
     return;
   auto swap_promise = base::MakeUnique<SatisfySwapPromise>(
       std::move(reference_returner),
       layer_tree_host()->GetTaskRunnerProvider()->MainThreadTaskRunner());
   layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise(
       std::move(swap_promise));
 }
 
 }  // namespace cc