Unify SurfaceInfo

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"
@@ skipping 747 matching lines @@
                                                IsOperationSource(pair.first));
   }
 }
 
 void WindowServer::OnGpuServiceInitialized() {
   // TODO(kylechar): When gpu channel is removed, this can instead happen
   // earlier, after GpuHost::OnInitialized().
   delegate_->StartDisplayInit();
 }
 
-void WindowServer::OnSurfaceCreated(const cc::SurfaceId& surface_id,
-                                    const gfx::Size& frame_size,
-                                    float device_scale_factor) {
+void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   WindowId window_id(
-      WindowIdFromTransportId(surface_id.frame_sink_id().client_id()));
+      WindowIdFromTransportId(surface_info.id().frame_sink_id().client_id()));
   mojom::CompositorFrameSinkType compositor_frame_sink_type(
       static_cast<mojom::CompositorFrameSinkType>(
-          surface_id.frame_sink_id().sink_id()));
+          surface_info.id().frame_sink_id().sink_id()));
   ServerWindow* window = GetWindow(window_id);
   // If the window doesn't have a parent then we have nothing to propagate.
   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);
+      compositor_frame_sink_type, surface_info);
 
   // FrameGenerator will add an appropriate reference for the new surface.
   DCHECK(display_manager_->GetDisplayContaining(window));
   display_manager_->GetDisplayContaining(window)
       ->platform_display()
       ->GetFrameGenerator()
-      ->OnSurfaceCreated(surface_id, window);
+      ->OnSurfaceCreated(surface_info.id(), window);
 
   // This is only used for testing to observe that a window has a
   // CompositorFrame.
   if (!window_paint_callback_.is_null())
     window_paint_callback_.Run(window);
 
   // 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);
-  }
+  if (window_tree)
+    window_tree->ProcessWindowSurfaceChanged(window, surface_info);
 }
 
 void WindowServer::OnDisplayCompositorCreated(
     const cc::SurfaceId& root_surface_id) {
   root_surface_id_ = root_surface_id;
 }
 
 void WindowServer::OnActiveUserIdChanged(const UserId& previously_active_id,
                                          const UserId& active_id) {
 }
 
 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