Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

services/ui/ws/server_window_compositor_frame_sink_manager.cc

 // Copyright 2015 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/server_window_compositor_frame_sink_manager.h"
 
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink.h"
@@ skipping 27 matching lines @@
   return !waiting_for_initial_frames_;
 }
 
 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
     mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   cc::FrameSinkId frame_sink_id(
       WindowIdToTransportId(window_->id()),
       static_cast<uint32_t>(compositor_frame_sink_type));
-  std::unique_ptr<ServerWindowCompositorFrameSink> compositor_frame_sink(
-      new ServerWindowCompositorFrameSink(
-          this, frame_sink_id, std::move(request), std::move(client)));
+  CompositorFrameSinkData data;
+  data.compositor_frame_sink =
+      base::MakeUnique<ServerWindowCompositorFrameSink>(
+          this, frame_sink_id, std::move(request), std::move(client));
+
   type_to_compositor_frame_sink_map_[compositor_frame_sink_type] =
-      std::move(compositor_frame_sink);
+      std::move(data);
 }
 
 ServerWindowCompositorFrameSink*
 ServerWindowCompositorFrameSinkManager::GetDefaultCompositorFrameSink() const {
   return GetCompositorFrameSinkByType(mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 ServerWindowCompositorFrameSink*
 ServerWindowCompositorFrameSinkManager::GetUnderlayCompositorFrameSink() const {
   return GetCompositorFrameSinkByType(mojom::CompositorFrameSinkType::UNDERLAY);
 }
 
 ServerWindowCompositorFrameSink*
 ServerWindowCompositorFrameSinkManager::GetCompositorFrameSinkByType(
     mojom::CompositorFrameSinkType type) const {
   auto iter = type_to_compositor_frame_sink_map_.find(type);
-  return iter == type_to_compositor_frame_sink_map_.end() ? nullptr
-                                                          : iter->second.get();
+  return iter == type_to_compositor_frame_sink_map_.end()
+             ? nullptr
+             : iter->second.compositor_frame_sink.get();
 }
 
 bool ServerWindowCompositorFrameSinkManager::HasCompositorFrameSinkOfType(
     mojom::CompositorFrameSinkType type) const {
   return type_to_compositor_frame_sink_map_.count(type) > 0;
 }
 
 bool ServerWindowCompositorFrameSinkManager::HasAnyCompositorFrameSink() const {
   return GetDefaultCompositorFrameSink() || GetUnderlayCompositorFrameSink();
 }
 
+gfx::Size ServerWindowCompositorFrameSinkManager::GetLastFrameSize(
+    mojom::CompositorFrameSinkType type) const {
+  auto it = type_to_compositor_frame_sink_map_.find(type);
+  if (it == type_to_compositor_frame_sink_map_.end())
+    return gfx::Size();
+
+  return it->second.last_submitted_frame_size;
+}
+
+cc::SurfaceId ServerWindowCompositorFrameSinkManager::GetLastSurfaceId(
+    mojom::CompositorFrameSinkType type) const {
+  auto it = type_to_compositor_frame_sink_map_.find(type);
+  if (it == type_to_compositor_frame_sink_map_.end())
+    return cc::SurfaceId();
+
+  return it->second.last_submitted_surface_id;
+}
+
+void ServerWindowCompositorFrameSinkManager::SetLastSurfaceId(
+    mojom::CompositorFrameSinkType type,
+    const cc::SurfaceId& surface_id,
+    const gfx::Size& frame_size) {
+  CompositorFrameSinkData& data = type_to_compositor_frame_sink_map_[type];
+  data.last_submitted_surface_id = surface_id;
+  data.last_submitted_frame_size = frame_size;
+}
+
 cc::SurfaceManager*
 ServerWindowCompositorFrameSinkManager::GetCompositorFrameSinkManager() {
   return window()->delegate()->GetDisplayCompositor()->manager();
 }
 
 bool ServerWindowCompositorFrameSinkManager::
     IsCompositorFrameSinkReadyAndNonEmpty(
         mojom::CompositorFrameSinkType type) const {
   auto iter = type_to_compositor_frame_sink_map_.find(type);
   if (iter == type_to_compositor_frame_sink_map_.end())
     return false;
-  if (iter->second->last_submitted_frame_size().IsEmpty())
+  if (!iter->second.compositor_frame_sink ||
+      iter->second.compositor_frame_sink->last_submitted_frame_size().IsEmpty())
     return false;
   const gfx::Size& last_submitted_frame_size =
-      iter->second->last_submitted_frame_size();
+      iter->second.compositor_frame_sink->last_submitted_frame_size();
   return last_submitted_frame_size.width() >= window_->bounds().width() &&
          last_submitted_frame_size.height() >= window_->bounds().height();
 }
 
+CompositorFrameSinkData::CompositorFrameSinkData() {}
+
+CompositorFrameSinkData::~CompositorFrameSinkData() {}
+
+CompositorFrameSinkData::CompositorFrameSinkData(
+    CompositorFrameSinkData&& other)
+    : last_submitted_surface_id(other.last_submitted_surface_id),
+      compositor_frame_sink(std::move(other.compositor_frame_sink)) {}
+
+CompositorFrameSinkData& CompositorFrameSinkData::operator=(
+    CompositorFrameSinkData&& other) {
+  last_submitted_surface_id = other.last_submitted_surface_id;
+  compositor_frame_sink = std::move(other.compositor_frame_sink);
+  return *this;
+}
+
 }  // namespace ws
 }  // namespace ui