Mus+Ash: propagate Surface ID to parents

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 28 matching lines @@
 };
 
 struct WindowServer::CurrentDragLoopState {
   uint32_t change_id;
   ServerWindow* window;
   WindowTree* initiator;
 };
 
 WindowServer::WindowServer(WindowServerDelegate* delegate)
     : delegate_(delegate),
-      display_compositor_(new DisplayCompositor()),
+      display_compositor_(new DisplayCompositor(this)),
       next_client_id_(1),
       display_manager_(new DisplayManager(this, &user_id_tracker_)),
       current_operation_(nullptr),
       in_destructor_(false),
       next_wm_change_id_(0),
       gpu_proxy_(new GpuServiceProxy(this)),
       window_manager_window_tree_factory_set_(this, &user_id_tracker_) {
   user_id_tracker_.AddObserver(this);
   OnUserIdAdded(user_id_tracker_.active_id());
 }
@@ skipping 732 matching lines @@
 }
 
 void WindowServer::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel) {
   gpu_channel_ = std::move(gpu_channel);
   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::SurfaceType surface_type(
+      static_cast<mojom::SurfaceType>(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::SurfaceType::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())
+    return;
+  GetTreeWithId(window->parent()->id().client_id)

[sky, 2016/10/14 22:44:36]

Please make sure there is a WindowTree. I'm mildly worried about the WM trying
to submit a surface for it's root.

[Fady Samuel, 2016/10/14 23:09:50]

Done.

+      ->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