Revert of Move surface reference code to CompositorFrameSinkSupport.

cc/surfaces/compositor_frame_sink_support.h

 // 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.
 
 #ifndef CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 #define CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_
 
-#include <memory>
-#include <unordered_set>
-
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_client.h"
-#include "cc/surfaces/referenced_surface_tracker.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
-#include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 
 class CompositorFrameSinkSupportClient;
 class Display;
 class SurfaceManager;
 
 class CC_SURFACES_EXPORT CompositorFrameSinkSupport
     : public NON_EXPORTED_BASE(DisplayClient),
@@ skipping 22 matching lines @@
   void Require(const LocalSurfaceId& local_surface_id,
                const SurfaceSequence& sequence);
   void Satisfy(const SurfaceSequence& sequence);
   void AddChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void ForceReclaimResources();
 
   Display* display() { return display_; }
 
  private:
-  // Update surface references with SurfaceManager for current CompositorFrame
-  // that has |local_surface_id|. UpdateReferences() must be called on
-  // |reference_tracker_| before calling this. Will add and remove top-level
-  // root references if |display_| is not null.
-  void UpdateSurfaceReferences(const SurfaceId& last_surface_id,
-                               const LocalSurfaceId& local_surface_id);
-
-  void AddTopLevelRootReference(const SurfaceId& surface_id);
-  void RemoveTopLevelRootReference(const SurfaceId& surface_id);
-
   void DidReceiveCompositorFrameAck();
 
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override;
@@ skipping 37 matching lines @@
   // A SurfaceSequence's validity is bound to the lifetime of the parent
   // FrameSink that created it. We track the lifetime of FrameSink's through
   // RegisterFrameSinkId and InvalidateFrameSink. During startup and GPU
   // restart, a SurfaceSequence created by the top most layer compositor may be
   // used prior to the creation of the associated CompositorFrameSinkSupport.
   // CompositorFrameSinkSupport is created asynchronously when a new GPU channel
   // is established. Once we switch to SurfaceReferences, this ordering concern
   // goes away and we can remove this bool.
   const bool handles_frame_sink_id_invalidation_;
 
-  // Track the surface references for the surface corresponding to this
-  // compositor frame sink.
-  ReferencedSurfaceTracker reference_tracker_;
-
   // The set of BeginFrame children of this CompositorFrameSink.
   std::unordered_set<FrameSinkId, FrameSinkIdHash> child_frame_sinks_;
 
   base::WeakPtrFactory<CompositorFrameSinkSupport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkSupport);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_COMPOSITOR_FRAME_SINK_SUPPORT_H_