Add CompositorFrameSinkClientBinding To Be Used By FrameGenerator

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 <utility>
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/display/screen_manager.h"
 #include "services/ui/public/interfaces/cursor/cursor_struct_traits.h"
-#include "services/ui/ws/display_client_compositor_frame_sink.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)
 #include "ui/platform_window/win/win_window.h"
@@ skipping 231 matching lines @@
   cc::mojom::MojoCompositorFrameSinkClientPtr compositor_frame_sink_client;
   cc::mojom::MojoCompositorFrameSinkClientRequest
       compositor_frame_sink_client_request =
           mojo::MakeRequest(&compositor_frame_sink_client);
 
   root_window_->CreateRootCompositorFrameSink(
       widget_, mojo::MakeRequest(&compositor_frame_sink),
       std::move(compositor_frame_sink_client),
       mojo::MakeRequest(&display_private));
 
-  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));
-  frame_generator_ = base::MakeUnique<FrameGenerator>(
-      std::move(display_client_compositor_frame_sink));
+  frame_generator_ = base::MakeUnique<FrameGenerator>();
+  auto frame_sink_client_binding =
+      base::MakeUnique<CompositorFrameSinkClientBinding>(
+          frame_generator_.get(),
+          std::move(compositor_frame_sink_client_request),
+          std::move(compositor_frame_sink), std::move(display_private));
+  frame_generator_->Bind(std::move(frame_sink_client_binding));
   frame_generator_->OnWindowSizeChanged(root_window_->bounds().size());
   frame_generator_->SetDeviceScaleFactor(metrics_.device_scale_factor);
 }
 
 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void PlatformDisplayDefault::OnActivationChanged(bool active) {}
 
 }  // namespace ws
 }  // namespace ui