GpuDisplayCompositorFrameSink => GpuRootCompositorFrameSink

components/display_compositor/gpu_root_compositor_frame_sink.h

Index: components/display_compositor/gpu_root_compositor_frame_sink.h
diff --git a/components/display_compositor/gpu_root_compositor_frame_sink.h b/components/display_compositor/gpu_root_compositor_frame_sink.h
new file mode 100644
index 0000000000000000000000000000000000000000..4f9aceeddc92d0b102677312a119386c5fda1bd3
--- /dev/null
+++ b/components/display_compositor/gpu_root_compositor_frame_sink.h
@@ -0,0 +1,102 @@
+// Copyright 2017 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_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
+#define COMPONENTS_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
+
+#include "cc/surfaces/display.h"

[danakj, 2017/02/23 22:13:46]

forward declare?

[Fady Samuel, 2017/02/23 23:14:58]

Done.

+#include "cc/surfaces/display_client.h"
+#include "components/display_compositor/gpu_compositor_frame_sink.h"

[danakj, 2017/02/23 22:13:47]

needed?

[Fady Samuel, 2017/02/23 23:14:58]

Not anymore, removed.

+#include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"

[danakj, 2017/02/23 22:13:48]

forward declare?

[Fady Samuel, 2017/02/23 23:14:58]

Done.

+#include "mojo/public/cpp/bindings/associated_binding.h"
+
+namespace display_compositor {
+
+class DISPLAY_COMPOSITOR_EXPORT GpuRootCompositorFrameSink
+    : public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient),
+      public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink),
+      public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate),
+      public NON_EXPORTED_BASE(cc::mojom::DisplayPrivate),
+      public NON_EXPORTED_BASE(cc::DisplayClient) {
+ public:
+  GpuRootCompositorFrameSink(
+      GpuCompositorFrameSinkDelegate* delegate,
+      cc::SurfaceManager* surface_manager,
+      const cc::FrameSinkId& frame_sink_id,
+      std::unique_ptr<cc::Display> display,
+      std::unique_ptr<cc::BeginFrameSource> begin_frame_source,

[danakj, 2017/02/23 22:13:45]

forward declare the types this uses

[Fady Samuel, 2017/02/23 23:14:58]

Done.

+      cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
+      cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
+      cc::mojom::MojoCompositorFrameSinkClientPtr client,
+      cc::mojom::DisplayPrivateAssociatedRequest display_private_request);
+
+  ~GpuRootCompositorFrameSink() override;
+
+  // cc::mojom::DisplayPrivate:
+  void SetDisplayVisible(bool visible) override;
+  void ResizeDisplay(const gfx::Size& size) override;
+  void SetDisplayColorSpace(const gfx::ColorSpace& color_space) override;
+  void SetOutputIsSecure(bool secure) override;
+  void SetLocalSurfaceId(const cc::LocalSurfaceId& local_surface_id,
+                         float scale_factor) override;
+
+  // cc::mojom::MojoCompositorFrameSink:
+  void EvictFrame() override;
+  void SetNeedsBeginFrame(bool needs_begin_frame) override;
+  void SubmitCompositorFrame(const cc::LocalSurfaceId& local_surface_id,
+                             cc::CompositorFrame frame) override;
+  void Require(const cc::LocalSurfaceId& local_surface_id,
+               const cc::SurfaceSequence& sequence) override;
+  void Satisfy(const cc::SurfaceSequence& sequence) override;
+
+  // cc::mojom::MojoCompositorFrameSinkPrivate:
+  void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
+  void RemoveChildFrameSink(
+      const cc::FrameSinkId& child_frame_sink_id) override;
+  void RequestCopyOfSurface(
+      std::unique_ptr<cc::CopyOutputRequest> request) override;
+
+ private:
+  // cc::DisplayClient:
+  void DisplayOutputSurfaceLost() override;
+  void DisplayWillDrawAndSwap(bool will_draw_and_swap,
+                              const cc::RenderPassList& render_passes) override;
+  void DisplayDidDrawAndSwap() override;
+
+  // cc::CompositorFrameSinkSupportClient:
+  void DidReceiveCompositorFrameAck() override;
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
+  void WillDrawSurface(const cc::LocalSurfaceId& local_surface_id,
+                       const gfx::Rect& damage_rect) override;
+
+  void OnClientConnectionLost();
+  void OnPrivateConnectionLost();
+
+  GpuCompositorFrameSinkDelegate* const delegate_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
+
+  // GpuRootCompositorFrameSink holds a Display and its BeginFrameSource if
+  // it created with non-null gpu::SurfaceHandle. In the window server, the

[danakj, 2017/02/23 22:13:46]

was created with a 

[Fady Samuel, 2017/02/23 23:14:58]

Done.

+  // display root window's CompositorFrameSink will have a valid

[danakj, 2017/02/23 22:13:46]

This is the RootCFS doesn't it always have a display?

[Fady Samuel, 2017/02/23 23:14:58]

Yea, I removed the second sentence to avoid the confusion.

+  // gpu::SurfaceHandle.
+  std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_;
+  std::unique_ptr<cc::Display> display_;
+
+  bool client_connection_lost_ = false;
+  bool private_connection_lost_ = false;
+
+  cc::mojom::MojoCompositorFrameSinkClientPtr client_;
+  mojo::AssociatedBinding<cc::mojom::MojoCompositorFrameSink>
+      compositor_frame_sink_binding_;
+  mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate>
+      compositor_frame_sink_private_binding_;
+  mojo::AssociatedBinding<cc::mojom::DisplayPrivate> display_private_binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(GpuRootCompositorFrameSink);
+};
+
+}  // namespace display_compositor
+
+#endif  // COMPONENTS_DISPLAY_COMPOSITOR_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_