Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/compositor_frame_sink_holder.h

Index: components/exo/compositor_frame_sink_holder.h
diff --git a/components/exo/compositor_frame_sink_holder.h b/components/exo/compositor_frame_sink_holder.h
new file mode 100644
index 0000000000000000000000000000000000000000..b960fb2a60c34d382050a3e72cba6a71dbe145c5
--- /dev/null
+++ b/components/exo/compositor_frame_sink_holder.h
@@ -0,0 +1,94 @@
+// 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>
+
+#include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
+#include "cc/resources/single_release_callback.h"
+#include "cc/resources/transferable_resource.h"
+#include "cc/scheduler/begin_frame_source.h"
+#include "components/exo/compositor_frame_sink.h"
+#include "mojo/public/cpp/bindings/binding.h"
+
+namespace exo {
+class Surface;
+
+using FrameCallback = base::Callback<void(base::TimeTicks frame_time)>;

[reveman, 2016/12/07 00:46:57]

Can you move this into the class and just above ActivateFrameCallbacks()? It's
fine to duplicate it in surface.h I think.

[Alex Z., 2016/12/07 20:09:35]

Done.

+
+class CompositorFrameSinkHolder

[reveman, 2016/12/07 00:46:57]

Can you add a short class description here that explains the purpose of this
class?

[Alex Z., 2016/12/07 20:09:35]

Done.

+    : public base::RefCounted<CompositorFrameSinkHolder>,
+      public cc::ExternalBeginFrameSourceClient,
+      public cc::mojom::MojoCompositorFrameSinkClient,
+      public cc::BeginFrameObserver {
+ public:
+  CompositorFrameSinkHolder(
+      cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink,
+      base::WeakPtr<Surface> surface,
+      cc::mojom::MojoCompositorFrameSinkClientRequest request);
+
+  bool HasReleaseCallbacks(cc::ResourceId id);

[reveman, 2016/12/07 00:46:57]

HasReleaseCallbacksForResource or ResourceHasReleaseCallbacks?

[Alex Z., 2016/12/07 20:09:35]

Done.

+  bool IsReleaseCallbacksEmpty();

[reveman, 2016/12/07 00:46:57]

and this can then be named HasReleaseCallbacks

[Alex Z., 2016/12/07 20:09:35]

It turns out this is no longer being used so I removed it.

+  void AddResourceReleaseCallback(
+      cc::ResourceId id,
+      std::unique_ptr<cc::SingleReleaseCallback> callback);
+  cc::mojom::MojoCompositorFrameSink* GetCompositorFrameSink() {

[reveman, 2016/12/07 00:46:57]

nit: blankline before this? doesn't seem like it should be grouped with the 3
functions above..

[Alex Z., 2016/12/07 20:09:35]

Done.

+    return compositor_frame_sink_.get();
+  }
+
+  void ActivateFrameCallbacks(std::list<FrameCallback>& frame_callbacks);

[reveman, 2016/12/07 00:46:57]

"std::list<FrameCallback>* frame_callbacks" as it's not const and you're
modifying this parameter

[Alex Z., 2016/12/07 20:09:35]

Done.

+  void CancelFrameCallbacks();
+
+  void SetNeedsBeginFrame(bool needs_begin_frame);
+
+  // cc::mojom::MojoCompositorFrameSinkClient:

[reveman, 2016/12/07 00:46:57]

Overridden from cc::Mojo..

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

Done.

+  void DidReceiveCompositorFrameAck() override;
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
+  void WillDrawSurface() override;
+
+  // cc::BeginFrameObserver:

[reveman, 2016/12/07 00:46:57]

Overridden from..

[Alex Z., 2016/12/07 20:09:35]

Done.

+  const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override;
+  void OnBeginFrameSourcePausedChanged(bool paused) override;
+
+ private:
+  friend class base::RefCounted<CompositorFrameSinkHolder>;
+
+  ~CompositorFrameSinkHolder() override;
+
+  void UpdateNeedsBeginFrame();
+
+  // cc::ExternalBeginFrameSouceClient:

[reveman, 2016/12/07 00:46:57]

"Overridden from.." and don't make this private

[Alex Z., 2016/12/07 20:09:35]

Done.

+  void OnNeedsBeginFrames(bool needs_begin_frames) override;
+
+  using ResourceReleaseCallbacks =
+      std::map<int,
+               std::pair<scoped_refptr<CompositorFrameSinkHolder>,
+                         std::unique_ptr<cc::SingleReleaseCallback>>>;
+  ResourceReleaseCallbacks release_callbacks_;
+
+  cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
+

[reveman, 2016/12/07 00:46:57]

nit: you can remove the blanklines between member variables here and below
unless some of them makes sense to group together

[Alex Z., 2016/12/07 20:09:35]

Done.

+  base::WeakPtr<Surface> surface_;
+
+  std::list<FrameCallback> active_frame_callbacks_;
+
+  std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
+
+  bool needs_begin_frame_ = false;
+
+  cc::BeginFrameArgs last_begin_frame_args_;
+
+  mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(CompositorFrameSinkHolder);
+};
+
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_COMPOSITOR_FRAME_SINK_HOLDER_H_