Index: components/exo/surface.h |
diff --git a/components/exo/surface.h b/components/exo/surface.h |
index 032cd57f8af55c8f4bda996a30ef76cbf39baa5e..746a980688d4f7e572da5a70e5c8889c49205039 100644 |
--- a/components/exo/surface.h |
+++ b/components/exo/surface.h |
@@ -18,6 +18,10 @@ |
#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 "cc/surfaces/surface_id_allocator.h" |
+#include "components/exo/compositor_frame_sink_holder.h" |
+#include "components/exo/exo_compositor_frame_sink.h" |
#include "third_party/skia/include/core/SkBlendMode.h" |
#include "third_party/skia/include/core/SkRegion.h" |
#include "ui/aura/window.h" |
@@ -57,37 +61,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 +77,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 +322,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_; |
+ |
+ // std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_; |
+ |
cc::SurfaceManager* surface_manager_; |
- scoped_refptr<SurfaceFactoryOwner> factory_owner_; |
+ scoped_refptr<CompositorFrameSinkHolder> compositor_frame_sink_holder_; |
+ |
+ 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. |
@@ -423,6 +400,8 @@ class Surface : public ui::ContextFactoryObserver, |
// Surface observer list. Surface does not own the observers. |
base::ObserverList<SurfaceObserver, true> observers_; |
+ base::WeakPtrFactory<Surface> weak_ptr_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(Surface); |
}; |