Revert of Move surface reference code to CompositorFrameSinkSupport.

cc/surfaces/compositor_frame_sink_support.cc

 // Copyright 2016 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/surfaces/compositor_frame_sink_support.h"
 
-#include <algorithm>
-#include <utility>
-#include <vector>
-
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
-#include "cc/surfaces/surface_reference.h"
 
 namespace cc {
 
 CompositorFrameSinkSupport::CompositorFrameSinkSupport(
     CompositorFrameSinkSupportClient* client,
     SurfaceManager* surface_manager,
     const FrameSinkId& frame_sink_id,
     Display* display,
     bool handles_frame_sink_id_invalidation,
     bool needs_sync_points)
     : client_(client),
       surface_manager_(surface_manager),
       frame_sink_id_(frame_sink_id),
       display_(display),
       surface_factory_(frame_sink_id_, surface_manager_, this),
       handles_frame_sink_id_invalidation_(handles_frame_sink_id_invalidation),
-      reference_tracker_(frame_sink_id),
       weak_factory_(this) {
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->RegisterFrameSinkId(frame_sink_id_);
 
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_factory_.set_needs_sync_points(needs_sync_points);
 
   if (display_)
     display_->Initialize(this, surface_manager_);
 }
 
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   // Unregister |this| as a BeginFrameObserver so that the BeginFrameSource does
   // not call into |this| after it's deleted.
   SetNeedsBeginFrame(false);
 
-  // For display root surfaces, the surface is no longer going to be visible
-  // so make it unreachable from the top-level root.
-  if (surface_manager_->using_surface_references() && display_ &&
-      reference_tracker_.current_surface_id().is_valid())
-    RemoveTopLevelRootReference(reference_tracker_.current_surface_id());
-
   for (auto& child_frame_sink_id : child_frame_sinks_) {
     DCHECK(child_frame_sink_id.is_valid());
     surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                    child_frame_sink_id);
   }
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
   surface_factory_.EvictSurface();
   surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
@@ skipping 11 matching lines @@
 }
 
 void CompositorFrameSinkSupport::SubmitCompositorFrame(
     const LocalSurfaceId& local_surface_id,
     CompositorFrame frame) {
   ++ack_pending_count_;
   if (display_) {
     display_->SetLocalSurfaceId(local_surface_id,
                                 frame.metadata.device_scale_factor);
   }
-
-  if (surface_manager_->using_surface_references()) {
-    SurfaceId last_surface_id = reference_tracker_.current_surface_id();
-
-    // Populate surface references to add/remove based on reference surfaces in
-    // current frame compared with the last frame.
-    reference_tracker_.UpdateReferences(local_surface_id,
-                                        frame.metadata.referenced_surfaces);
-
-    surface_factory_.SubmitCompositorFrame(
-        local_surface_id, std::move(frame),
-        base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
-                   weak_factory_.GetWeakPtr()));
-
-    UpdateSurfaceReferences(last_surface_id, local_surface_id);
-  } else {
-    surface_factory_.SubmitCompositorFrame(
-        local_surface_id, std::move(frame),
-        base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
-                   weak_factory_.GetWeakPtr()));
-  }
+  surface_factory_.SubmitCompositorFrame(
+      local_surface_id, std::move(frame),
+      base::Bind(&CompositorFrameSinkSupport::DidReceiveCompositorFrameAck,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void CompositorFrameSinkSupport::Require(const LocalSurfaceId& local_surface_id,
                                          const SurfaceSequence& sequence) {
   surface_manager_->RequireSequence(SurfaceId(frame_sink_id_, local_surface_id),
                                     sequence);
 }
 
 void CompositorFrameSinkSupport::Satisfy(const SurfaceSequence& sequence) {
   surface_manager_->SatisfySequence(sequence);
 }
 
-void CompositorFrameSinkSupport::UpdateSurfaceReferences(
-    const SurfaceId& last_surface_id,
-    const LocalSurfaceId& local_surface_id) {
-  const bool surface_id_changed =
-      last_surface_id.local_surface_id() != local_surface_id;
-
-  // If this is a display root surface and the SurfaceId is changing, make the
-  // new SurfaceId reachable from the top-level root.
-  if (display_ && surface_id_changed)
-    AddTopLevelRootReference(reference_tracker_.current_surface_id());
-
-  // Add references based on CompositorFrame referenced surfaces. If the
-  // SurfaceId has changed all referenced surfaces will be in this list.
-  if (!reference_tracker_.references_to_add().empty()) {
-    surface_manager_->AddSurfaceReferences(
-        reference_tracker_.references_to_add());
-  }
-
-  // If this is a display root surface and the SurfaceId is changing, make the
-  // old SurfaceId unreachable from the top-level root. This needs to happen
-  // after adding all references for the new SurfaceId.
-  if (display_ && surface_id_changed && last_surface_id.is_valid())
-    RemoveTopLevelRootReference(last_surface_id);
-
-  // Remove references based on CompositorFrame referenced surfaces. If the
-  // SurfaceId has changed this list will be empty.
-  if (!reference_tracker_.references_to_remove().empty()) {
-    DCHECK(!surface_id_changed);
-    surface_manager_->RemoveSurfaceReferences(
-        reference_tracker_.references_to_remove());
-  }
-}
-
-void CompositorFrameSinkSupport::AddTopLevelRootReference(
-    const SurfaceId& surface_id) {
-  SurfaceReference reference(surface_manager_->GetRootSurfaceId(), surface_id);
-  surface_manager_->AddSurfaceReferences({reference});
-}
-
-void CompositorFrameSinkSupport::RemoveTopLevelRootReference(
-    const SurfaceId& surface_id) {
-  SurfaceReference reference(surface_manager_->GetRootSurfaceId(), surface_id);
-  surface_manager_->RemoveSurfaceReferences({reference});
-}
-
 void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() {
   DCHECK_GT(ack_pending_count_, 0);
   ack_pending_count_--;
 
   if (!client_)
     return;
   client_->DidReceiveCompositorFrameAck();
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
     surface_returned_resources_.clear();
@@ skipping 82 matching lines @@
     return;
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace cc