Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/exo_compositor_frame_sink.h

Index: components/exo/exo_compositor_frame_sink.h
diff --git a/components/exo/exo_compositor_frame_sink.h b/components/exo/exo_compositor_frame_sink.h
new file mode 100644
index 0000000000000000000000000000000000000000..1a2aaaabc3276acee83380c4c41ee59b85f9874e
--- /dev/null
+++ b/components/exo/exo_compositor_frame_sink.h
@@ -0,0 +1,86 @@
+// 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 <list>
+#include <memory>
+#include <set>
+#include <utility>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
+#include "cc/ipc/compositor_frame.mojom.h"
+#include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
+#include "cc/resources/transferable_resource.h"
+#include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/surface_factory.h"
+#include "cc/surfaces/surface_factory_client.h"
+#include "cc/surfaces/surface_id_allocator.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkXfermode.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace cc {
+class SurfaceFactory;
+}
+
+namespace exo {
+
+// 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 ExoCompositorFrameSink : public base::RefCounted<ExoCompositorFrameSink>,
+                               public cc::SurfaceFactoryClient,
+                               public cc::BeginFrameObserver {
+ public:
+  ExoCompositorFrameSink(const cc::FrameSinkId& frame_sink_id);
+
+  void Init(cc::SurfaceManager* surface_manager);
+  void UnregisterSurface(const cc::SurfaceId& surface_id);
+  const cc::SurfaceId& CommitToNewSurface(
+      const cc::LocalFrameId& old_local_frame_id);
+
+  // 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;
+
+  // cc::BeginFrameObserver:
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
+  void OnBeginFrameSourcePausedChanged(bool paused) override;
+
+  const cc::FrameSinkId& frame_sink_id() { return frame_sink_id_; }
+
+ private:
+  friend class base::RefCounted<ExoCompositorFrameSink>;
+  friend class Surface;
+
+  ~ExoCompositorFrameSink() override;
+  void UpdateNeedsBeginFrameInternal();
+
+  std::map<int,
+           std::pair<scoped_refptr<ExoCompositorFrameSink>,
+                     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_;
+
+  cc::BeginFrameSource* begin_frame_source_ = nullptr;
+
+  cc::BeginFrameArgs last_begin_frame_args_;
+
+  bool needs_begin_frame_ = false;
+  bool added_frame_observer_ = false;
+};
+
+}  // namespace exo