[exo] Clean up BeginFrame distribution & add acks in Surface.

components/exo/compositor_frame_sink_holder.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 COMPONENTS_EXO_COMPOSITOR_FRAME_SINK_HOLDER_H_
 #define COMPONENTS_EXO_COMPOSITOR_FRAME_SINK_HOLDER_H_
 
 #include <list>
 #include <map>
 #include <memory>
@@ skipping 10 matching lines @@
 class Surface;
 
 // This class talks to MojoCompositorFrameSink and keeps track of references to
 // the contents of Buffers. It's keeped alive by references from
 // release_callbacks_. It's destroyed when its owning Surface is destroyed and
 // the last outstanding release callback is called.
 class CompositorFrameSinkHolder
     : public base::RefCounted<CompositorFrameSinkHolder>,
       public cc::ExternalBeginFrameSourceClient,
       public cc::mojom::MojoCompositorFrameSinkClient,
-      public cc::BeginFrameObserver,
       public SurfaceObserver {
  public:
   CompositorFrameSinkHolder(Surface* surface,
                             const cc::FrameSinkId& frame_sink_id,
                             cc::SurfaceManager* surface_manager);
 
   bool HasReleaseCallbackForResource(cc::ResourceId id);
   void SetResourceReleaseCallback(cc::ResourceId id,
                                   const cc::ReleaseCallback& callback);
 
   CompositorFrameSink* GetCompositorFrameSink() { return frame_sink_.get(); }
 
   base::WeakPtr<CompositorFrameSinkHolder> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
-  void SetNeedsBeginFrame(bool needs_begin_frame);
-
   // Overridden from cc::mojom::MojoCompositorFrameSinkClient:
   void DidReceiveCompositorFrameAck() override;
   void OnBeginFrame(const cc::BeginFrameArgs& args) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
   void WillDrawSurface(const cc::LocalSurfaceId& local_surface_id,
                        const gfx::Rect& damage_rect) override;
 
-  // Overridden from cc::BeginFrameObserver:
-  const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
-  void OnBeginFrameSourcePausedChanged(bool paused) override;
-
   // Overridden from cc::ExternalBeginFrameSourceClient:
   void OnNeedsBeginFrames(bool needs_begin_frames) override;
   void OnDidFinishFrame(const cc::BeginFrameAck& ack) override;
 
   // Overridden from SurfaceObserver:
   void OnSurfaceDestroying(Surface* surface) override;
 
  private:
   friend class base::RefCounted<CompositorFrameSinkHolder>;
 
   ~CompositorFrameSinkHolder() override;
 
-  void UpdateNeedsBeginFrame();
-
   // A collection of callbacks used to release resources.
   using ResourceReleaseCallbackMap = std::map<int, cc::ReleaseCallback>;
   ResourceReleaseCallbackMap release_callbacks_;
 
   Surface* surface_;
   std::unique_ptr<CompositorFrameSink> frame_sink_;
-
   std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
-  bool needs_begin_frame_ = false;
-  cc::BeginFrameArgs last_begin_frame_args_;
 
   base::WeakPtrFactory<CompositorFrameSinkHolder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkHolder);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_COMPOSITOR_FRAME_SINK_HOLDER_H_