Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/surface.h

Index: components/exo/surface.h
diff --git a/components/exo/surface.h b/components/exo/surface.h
index 6a03b04a714fa1613c4cd06d51edee6838311e28..b5680838736a824c85dd1e76243bce2e20ed84e1 100644
--- a/components/exo/surface.h
+++ b/components/exo/surface.h
@@ -18,6 +18,9 @@
 #include "cc/resources/transferable_resource.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_id.h"
+#include "components/exo/compositor_frame_sink_holder.h"
+#include "components/exo/exo_compositor_frame_sink.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/aura/window.h"
@@ -57,37 +60,6 @@ class PropertyHelper;
 // change in the future when better hardware cursor support is added.
 using CursorProvider = Pointer;
 
-// This class owns the SurfaceFactory 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 SurfaceFactoryOwner : public base::RefCounted<SurfaceFactoryOwner>,
-                            public cc::SurfaceFactoryClient {
- public:
-  SurfaceFactoryOwner();
-
-  // Overridden from cc::SurfaceFactoryClient:
-  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-  void WillDrawSurface(const cc::LocalFrameId& id,
-                       const gfx::Rect& damage_rect) override;
-  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
-
- private:
-  friend class base::RefCounted<SurfaceFactoryOwner>;
-  friend class Surface;
-
-  ~SurfaceFactoryOwner() override;
-
-  std::map<int,
-           std::pair<scoped_refptr<SurfaceFactoryOwner>,
-                     std::unique_ptr<cc::SingleReleaseCallback>>>
-      release_callbacks_;
-  cc::FrameSinkId frame_sink_id_;
-  std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
-  Surface* surface_ = nullptr;
-};
-
 // This class represents a rectangular area that is displayed on the screen.
 // It has a location, size and pixel contents.
 class Surface : public ui::ContextFactoryObserver,
@@ -104,7 +76,6 @@ class Surface : public ui::ContextFactoryObserver,
 
   aura::Window* window() { return window_.get(); }
 
-  const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
   cc::SurfaceId GetSurfaceId() const;
 
   // Set a buffer as the content of this surface. A buffer can only be attached
@@ -350,11 +321,16 @@ class Surface : public ui::ContextFactoryObserver,
   // The buffer that will become the content of surface when Commit() is called.
   BufferAttachment pending_buffer_;
 
+  const cc::FrameSinkId frame_sink_id_;
+
   cc::SurfaceManager* surface_manager_;

[Fady Samuel, 2016/11/21 16:51:37]

Do we still need this?

[Alex Z., 2016/12/07 21:13:43]

Done.

 
-  scoped_refptr<SurfaceFactoryOwner> factory_owner_;
+  scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder_;
+
+  scoped_refptr<ExoCompositorFrameSink> compositor_frame_sink_;

[Fady Samuel, 2016/11/21 16:51:37]

exo::Surface shouldn't hold a reference to ExoCompositorFrameSink directly. It
should be managed by CompositorFrameSinkHolder.

[Alex Z., 2016/12/07 21:13:43]

Done.

+
+  cc::SurfaceIdAllocator id_allocator_;
 
-  // The Surface Id currently attached to the window.
   cc::LocalFrameId local_frame_id_;
 
   // The next resource id the buffer will be attached to.