Mus: Remove dependency on ServerWindowCompositorFrameSink from FrameGenerator

services/ui/ws/window_server.cc

 // Copyright 2014 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/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/gpu_service_proxy.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/server_window.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/window_coordinate_conversions.h"
 #include "services/ui/ws/window_manager_access_policy.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_manager_window_tree_factory.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ skipping 767 matching lines @@
   const std::set<Display*>& displays = display_manager()->displays();
   for (auto* display : displays)
     display->platform_display()->OnGpuChannelEstablished(gpu_channel_);
 }
 
 void WindowServer::OnSurfaceCreated(const cc::SurfaceId& surface_id,
                                     const gfx::Size& frame_size,
                                     float device_scale_factor) {
   WindowId window_id(
       WindowIdFromTransportId(surface_id.frame_sink_id().client_id()));
-  mojom::CompositorFrameSinkType surface_type(
+  mojom::CompositorFrameSinkType compositor_frame_sink_type(
       static_cast<mojom::CompositorFrameSinkType>(
           surface_id.frame_sink_id().sink_id()));
-  // We only care about propagating default surface IDs.
-  // TODO(fsamuel, sadrul): we should get rid of surface types.
-  if (surface_type != mojom::CompositorFrameSinkType::DEFAULT)
-    return;
   ServerWindow* window = GetWindow(window_id);
   // If the window doesn't have a parent then we have nothing to propagate.
-  if (!window || !window->parent())
+  if (!window)
     return;
+
+  // Cache the last submitted surface ID in the window server.
+  // DisplayCompositorFrameSink may submit a CompositorFrame without
+  // creating a CompositorFrameSinkManager.
+  window->GetOrCreateCompositorFrameSinkManager()->SetLatestSurfaceInfo(
+      compositor_frame_sink_type, surface_id, frame_size);
+
+  // We only care about propagating default surface IDs.
+  // TODO(fsamuel, sadrul): we should get rid of CompositorFrameSinkTypes.
+  if (compositor_frame_sink_type != mojom::CompositorFrameSinkType::DEFAULT ||
+      !window->parent()) {
+    return;
+  }
   WindowTree* window_tree = GetTreeWithId(window->parent()->id().client_id);
   if (window_tree) {
     window_tree->ProcessWindowSurfaceChanged(window, surface_id, frame_size,
                                              device_scale_factor);
   }
 }
 
 void WindowServer::OnActiveUserIdChanged(const UserId& previously_active_id,
                                          const UserId& active_id) {
   if (IsUserInHighContrastMode(previously_active_id) ==
       IsUserInHighContrastMode(active_id))
     return;
   for (Display* display : display_manager_->displays()) {
     display->SchedulePaint(display->root_window(),
                            gfx::Rect(display->root_window()->bounds().size()));
   }
 }
 
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui