Revert of Mus+Ash: propagate Surface ID to parents

services/ui/public/interfaces/window_tree.mojom

 // 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.
 
 module ui.mojom;
 
 import "cc/ipc/surface_id.mojom";
-import "cc/ipc/surface_sequence.mojom";
 import "services/ui/public/interfaces/cursor.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/mus_constants.mojom";
 import "services/ui/public/interfaces/surface.mojom";
 import "services/ui/public/interfaces/window_manager.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 import "ui/platform_window/mojo/text_input_state.mojom";
@@ skipping 117 matching lines @@
 
   // Sets the opacity of the specified window to |opacity|.
   SetWindowOpacity(uint32 change_id, uint32 window_id, float opacity);
 
   // Attaches a Surface to a particular window.
   AttachSurface(uint32 window_id,
                 SurfaceType type,
                 Surface& surface,
                 SurfaceClient client);
 
-  // Returns surface reference back to window server for reclamation.
-  OnWindowSurfaceDetached(uint32 window_id, cc.mojom.SurfaceSequence sequence);
-
   // Reparents a window.
   // This fails for any of the following reasons:
   // . |parent| or |child| does not identify a valid window.
   // . |child| is an ancestor of |parent|.
   // . |child| is already a child of |parent|.
   //
   // This may result in a connection getting OnWindowDeleted(). See
   // RemoveWindowFromParent for details.
   AddWindow(uint32 change_id, uint32 parent, uint32 child);
 
@@ skipping 259 matching lines @@
 
   // Called in two distinct cases: when a window known to the connection gains
   // focus, or when focus moves from a window known to the connection to a
   // window not known to the connection. In the later case |focused_window_id|
   // is 0. As with other functions this is only called if the client did not
   // initiate the change.
   OnWindowFocused(uint32 focused_window_id);
 
   OnWindowPredefinedCursorChanged(uint32 window_id, Cursor cursor_id);
 
-  // Invoked when a client window submits a new surface ID. The surface ID and
-  // associated information is propagated to the parent connection. The parent
-  // compositor can take ownership of this surface ID and embed it along with
-  // the SurfaceSequence, frame_size, and device_scale_factor in a layer.
-  // TODO(fsamuel): Surface IDs should be passed to parents directly instead of
-  // going through the window server. http://crbug.com/655231
-  OnWindowSurfaceChanged(uint32 window_id,
-                         cc.mojom.SurfaceId surface_id,
-                         cc.mojom.SurfaceSequence surface_sequence,
-                         gfx.mojom.Size frame_size,
-                         float device_scale_factor);
-                         
   // Called when the mouse cursor enters a window on this connection for the
   // first time, providing a list of available mime types. We want to send this
   // set of data only one time, so this isn't part of OnDragEnter(), which
   // occurs every time the mouse enters a window.
   OnDragDropStart(map<string, array<uint8>> drag_data);
 
   // Called when the mouse cursor enters a window that has opted into
   // accepting drags through SetAcceptsDrags(), providing a list
   // of available mime types.  Returns a bitmask of the supported
   // operations.
@@ skipping 41 matching lines @@
   // See description of WindowManager for details.
   GetWindowManager(associated WindowManager& internal);
 };
 
 // Mus provides this interface as a way for clients to connect and obtain a
 // WindowTree handle with a supplied WindowTreeClient handle. The
 // WindowTreeClient has no roots, use NewTopLevelWindow() to create one.
 interface WindowTreeFactory {
   CreateWindowTree(WindowTree& tree_request, WindowTreeClient client);
 };