mus: Changes SetDisplayRoot() to create actual display

services/ui/public/interfaces/window_manager.mojom

 // 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.
 
 module ui.mojom;
 
 import "cc/ipc/frame_sink_id.mojom";
 import "cc/ipc/local_surface_id.mojom";
 import "services/ui/public/interfaces/cursor/cursor.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
 import "skia/public/interfaces/bitmap.mojom";
 import "ui/base/mojo/ui_base_types.mojom";
 import "ui/display/mojo/display.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/events/mojo/event_constants.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
+import "ui/display/mojo/display.mojom";
 
 // WindowManager is used when a WindowTreeClient attempts to modify
 // a property of the embed root. When this happens WindowTree calls the
 // appropriate function on WindowManager. For example, if a
 // WindowTreeClient calls SetWindowBounds() on its embed root, WindowTree
 // calls WmSetBounds(). WindowManager can then decide if it wants to
 // change the bounds or not.
 //
 // This interface is only used as an associated interface and is associated
 // with WindowTreeClient, further WindowTree requests this interface from
@@ skipping 237 matching lines @@
 
   // See WindowTree for details on event dispatch.
   // This ignores any accelerators already defined with the same id or matcher.
   // Returns true if all accelerators were added successfully.
   AddAccelerators(array<WmAccelerator> accelerators) => (bool success);
   RemoveAccelerator(uint32 id);
 
   // Sets the root of a particular display. This is only applicable when the
   // WindowTree was created with a value of false for
   // |automatically_create_display_roots| (see
-  // WindowManagerWindowTreeFactory::CreateWindowTree() for details).
-  SetDisplayRoot(int64 display_id, uint32 window_id) => (bool success);
+  // WindowManagerWindowTreeFactory::CreateWindowTree() for details). On success
+  // this responds with the FrameSinkId of the root. On failure the FrameSinkId
+  // is not valid.
+  SetDisplayRoot(display.mojom.Display display,

[kylechar, 2017/04/19 18:06:08]

This gets called initially once for each display right? How do you expect
removing/modifying displays to work?

[sky, 2017/04/19 19:30:02]

That's right.
Removing is implicitly handled when the root window is deleted.

To support modifying I'll need another function. I was hoping to get the add
working first. By which I mean a separate patch will add the modifying logic.

[kylechar, 2017/04/19 19:47:09]

sgtm!

+                 WmViewportMetrics viewport_metrics,
+                 bool is_primary_display,
+                 uint32 window_id) => (cc.mojom.FrameSinkId? frame_sink_id);
 
   // The window manager has completed a request with the specific change id.
   WmResponse(uint32 change_id, bool response);
 
   // The window manager has completed a SetBounds request with the specified
   // change id
   WmSetBoundsResponse(uint32 change_id);
 
   // Calls WindowTreeClient::RequestClose() on the embedded app at the
   // specified window.
@@ skipping 11 matching lines @@
   OnWmCreatedTopLevelWindow(uint32 change_id, uint32 window_id);
 
   // See description in WindowManager::OnAccelerator(). |ack_id| is the value
   // that was passed to OnAccelerator(). If the accelerator is a pre-target
   // handler and |event_result| is UNHANDLED, then |properties| is added to
   // the KeyEvent that is dispatched to the client with the focused window.
   OnAcceleratorAck(uint32 ack_id,
                    EventResult event_result,
                    map<string, array<uint8>> properties);
 };