Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

components/display_compositor/gpu_display_compositor_frame_sink.cc

Index: components/display_compositor/gpu_display_compositor_frame_sink.cc
diff --git a/components/display_compositor/gpu_display_compositor_frame_sink.cc b/components/display_compositor/gpu_display_compositor_frame_sink.cc
index a69dbe43a956212930b0b758c0073d18f1b4a03b..a05a58ea2a3da82111dc33303aa641c815b84ea0 100644
--- a/components/display_compositor/gpu_display_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_display_compositor_frame_sink.cc
@@ -20,9 +20,9 @@ GpuDisplayCompositorFrameSink::GpuDisplayCompositorFrameSink(
     : GpuCompositorFrameSink(delegate,
                              surface_manager,
                              frame_sink_id,
-                             display.get(),
                              std::move(compositor_frame_sink_private_request),
-                             std::move(client)),
+                             std::move(client),
+                             true /* has_display */),
       binding_(this, std::move(request)),
       display_private_binding_(this, std::move(display_private_request)),
       display_begin_frame_source_(std::move(begin_frame_source)),
@@ -30,30 +30,47 @@ GpuDisplayCompositorFrameSink::GpuDisplayCompositorFrameSink(
   binding_.set_connection_error_handler(
       base::Bind(&GpuDisplayCompositorFrameSink::OnClientConnectionLost,
                  base::Unretained(this)));
+  display_->Initialize(this, surface_manager);
   display_->SetVisible(true);
 }
 
 GpuDisplayCompositorFrameSink::~GpuDisplayCompositorFrameSink() = default;
 
+void GpuDisplayCompositorFrameSink::SubmitCompositorFrame(
+    const cc::LocalSurfaceId& local_surface_id,
+    cc::CompositorFrame frame) {
+  display_->SetLocalSurfaceId(local_surface_id,
+                              frame.metadata.device_scale_factor);
+
+  GpuCompositorFrameSink::SubmitCompositorFrame(local_surface_id,
+                                                std::move(frame));
+}
+
 void GpuDisplayCompositorFrameSink::SetDisplayVisible(bool visible) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetVisible(visible);
 }
 
 void GpuDisplayCompositorFrameSink::ResizeDisplay(const gfx::Size& size) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->Resize(size);
 }
 
 void GpuDisplayCompositorFrameSink::SetDisplayColorSpace(
     const gfx::ColorSpace& color_space) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetColorSpace(color_space);
 }
 
 void GpuDisplayCompositorFrameSink::SetOutputIsSecure(bool secure) {
-  DCHECK(support_.display());
+  DCHECK(display_);
   display_->SetOutputIsSecure(secure);
 }
 
+void GpuDisplayCompositorFrameSink::DisplayOutputSurfaceLost() {}

[Fady Samuel, 2017/02/08 17:54:42]

New line between each method.

[Alex Z., 2017/02/08 18:16:58]

Done.

+void GpuDisplayCompositorFrameSink::DisplayWillDrawAndSwap(
+    bool will_draw_and_swap,
+    const cc::RenderPassList& render_passes) {}
+void GpuDisplayCompositorFrameSink::DisplayDidDrawAndSwap() {}
+
 }  // namespace display_compositor