Add DisplayClientCompositorFrameSink

services/ui/ws/platform_display_default.cc

 // 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 "services/ui/ws/platform_display_default.h"
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/display/screen_manager.h"
+#include "services/ui/ws/display_client_compositor_frame_sink.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/platform_window/platform_ime_controller.h"
 #include "ui/platform_window/platform_window.h"
 
 #if defined(OS_WIN)
@@ skipping 221 matching lines @@
 
 void PlatformDisplayDefault::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget,
     float device_scale_factor) {
   // This will get called after Init() is called, either synchronously as part
   // of the Init() callstack or async after Init() has returned, depending on
   // the platform.
   DCHECK_EQ(gfx::kNullAcceleratedWidget, widget_);
   widget_ = widget;
   delegate_->OnAcceleratedWidgetAvailable();
-  frame_generator_ =
-      base::MakeUnique<FrameGenerator>(this, root_window_, widget_);
+
+  cc::mojom::MojoCompositorFrameSinkAssociatedPtr compositor_frame_sink;
+  cc::mojom::DisplayPrivateAssociatedPtr display_private;
+  cc::mojom::MojoCompositorFrameSinkClientPtr compositor_frame_sink_client;
+  cc::mojom::MojoCompositorFrameSinkClientRequest
+      compositor_frame_sink_client_request =
+          mojo::MakeRequest(&compositor_frame_sink_client);
+  cc::mojom::MojoCompositorFrameSinkAssociatedRequest sink_request =
+      mojo::MakeRequest(&compositor_frame_sink);
+  cc::mojom::DisplayPrivateAssociatedRequest display_request =
+      mojo::MakeRequest(&display_private);

[Fady Samuel, 2017/03/10 18:37:57]

Let's cut down the number of local variables here because this is hard to read,
pass MakeRequest directly. Thanks!

+  root_window_->CreateRootCompositorFrameSink(
+      widget_, std::move(sink_request), std::move(compositor_frame_sink_client),

[Fady Samuel, 2017/03/10 18:37:57]

mojo::MakeRequest(&compositor_frame_sink)

[Alex Z., 2017/03/10 19:08:39]

Done.

+      std::move(display_request));

[Fady Samuel, 2017/03/10 18:37:57]

MakeRequest(&display_private)

[Alex Z., 2017/03/10 19:08:39]

Done.

+
+  auto display_client_compositor_frame_sink =
+      base::MakeUnique<DisplayClientCompositorFrameSink>(
+          root_window_->frame_sink_id(), std::move(compositor_frame_sink),
+          std::move(display_private),
+          std::move(compositor_frame_sink_client_request));

[Fady Samuel, 2017/03/10 18:37:57]

mojo::MakeRequest(&compositor_frame_sink_client)?

[Alex Z., 2017/03/10 19:08:39]

Chrome mash window shows no content on startup once I change this to 
mojo::MakeRequest(&compositor_frame_sink_client);

I wonder if it has anything to do with order or evaluation?

+  frame_generator_ = base::MakeUnique<FrameGenerator>(
+      this, root_window_, widget_,
+      std::move(display_client_compositor_frame_sink));
   frame_generator_->SetDeviceScaleFactor(init_device_scale_factor_);
 }
 
 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void PlatformDisplayDefault::OnActivationChanged(bool active) {}
 
 bool PlatformDisplayDefault::IsInHighContrastMode() {
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 }  // namespace ws
 }  // namespace ui