Change exo::SurfaceFactoryOwner to exo::ExoCompositorFrameSink

components/exo/compositor_frame_sink.h

Index: components/exo/compositor_frame_sink.h
diff --git a/components/exo/compositor_frame_sink.h b/components/exo/compositor_frame_sink.h
new file mode 100644
index 0000000000000000000000000000000000000000..829048950f94214454b7608f8ad0fecf876b89c2
--- /dev/null
+++ b/components/exo/compositor_frame_sink.h
@@ -0,0 +1,60 @@
+// 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_EXO_COMPOSITOR_FRAME_SINK_H_
+#define COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_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/surfaces/compositor_frame_sink_support.h"
+#include "cc/surfaces/compositor_frame_sink_support_client.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+
+namespace exo {
+
+class CompositorFrameSink : public cc::CompositorFrameSinkSupportClient,
+                            public cc::mojom::MojoCompositorFrameSink {
+ public:
+  static void Create(const cc::FrameSinkId& frame_sink_id,
+                     cc::SurfaceManager* surface_manager,
+                     cc::mojom::MojoCompositorFrameSinkClientPtr client,
+                     cc::mojom::MojoCompositorFrameSinkRequest request);
+
+  CompositorFrameSink(const cc::FrameSinkId& frame_sink_id,
+                      cc::SurfaceManager* surface_manager,
+                      cc::mojom::MojoCompositorFrameSinkClientPtr client);
+
+  ~CompositorFrameSink() override;
+
+  // cc::mojom::MojoCompositorFrameSink:

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

nit: "// Overridden from cc::mojom::MojoCompositorFrameSink:" to be consistent
with existing exo code

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

Done.

+  void SetNeedsBeginFrame(bool needs_begin_frame) override;
+  void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
+                             cc::CompositorFrame frame) override;
+  void EvictFrame() override;
+  void Require(const cc::LocalFrameId& local_frame_id,
+               const cc::SurfaceSequence& sequence) override;
+  void Satisfy(const cc::SurfaceSequence& sequence) override;
+
+ private:
+  // cc::CompositorFrameSinkSupportClient:

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

nit: Overridden from cc::Comp...

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

Done.

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

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

I'm not a fan of changing access to functions as part of inheritance. I think
that's just confusing and you can always access these by upcasting

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

Done.

+
+  cc::CompositorFrameSinkSupport support_;
+

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

nit: no need for this blankline and l.50, l.52 ones

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

Done.

+  cc::mojom::MojoCompositorFrameSinkClientPtr client_;
+
+  cc::ReturnedResourceArray surface_returned_resources_;
+
+  mojo::StrongBindingPtr<cc::mojom::MojoCompositorFrameSink> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
+};
+
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_