WIP: Propagate SurfaceID up window tree hierarchy

services/ui/public/cpp/window_tree_client.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 115 matching lines @@
              uint32_t flags,
              const mojom::WindowTree::EmbedCallback& callback);
 
   void RequestClose(Window* window);
 
   void AttachSurface(Id window_id,
                      mojom::SurfaceType type,
                      mojo::InterfaceRequest<mojom::Surface> surface,
                      mojom::SurfaceClientPtr client);
 
+  void SatisfySurfaceSequence(Id window_id,
+                              const cc::SurfaceSequence& sequence);
+
   // Sets the input capture to |window| without notifying the server.
   void LocalSetCapture(Window* window);
   // Sets focus to |window| without notifying the server.
   void LocalSetFocus(Window* window);
 
   // Start/stop tracking windows. While tracked, they can be retrieved via
   // WindowTreeClient::GetWindowById.
   void AddWindow(Window* window);
 
   bool IsRoot(Window* window) const { return roots_.count(window) > 0; }
@@ skipping 49 matching lines @@
                          ui::mojom::MoveLoopSource source,
                          const gfx::Point& cursor_location,
                          const base::Callback<void(bool)>& callback);
 
   // Cancels a in progress window move. (If no window is currently being moved,
   // does nothing.)
   void CancelWindowMove(Window* window);
 
   // Creates and returns a new Window (which is owned by the window server).
   // Windows are initially hidden, use SetVisible(true) to show.
+  Window* NewWindowContainer() {
+    return NewWindow(nullptr, true /* container */);
+  }
   Window* NewWindow() { return NewWindow(nullptr); }
   Window* NewWindow(
-      const std::map<std::string, std::vector<uint8_t>>* properties);
+      const std::map<std::string, std::vector<uint8_t>>* properties,
+      bool container = false);
   Window* NewTopLevelWindow(
       const std::map<std::string, std::vector<uint8_t>>* properties);
 
   void AddObserver(WindowTreeClientObserver* observer);
   void RemoveObserver(WindowTreeClientObserver* observer);
 
 #if !defined(NDEBUG)
   std::string GetDebugWindowHierarchy() const;
   void BuildDebugInfo(const std::string& depth,
                       Window* window,
@@ skipping 26 matching lines @@
   // if there is no InFlightChange matching |change|.
   // See InFlightChange for details on how InFlightChanges are used.
   bool ApplyServerChangeToExistingInFlightChange(const InFlightChange& change);
 
   static Id server_id(const Window* window) { return window->server_id(); }
 
   Window* BuildWindowTree(const mojo::Array<mojom::WindowDataPtr>& windows,
                           Window* initial_parent);
 
   Window* NewWindowImpl(NewWindowType type,
-                        const Window::SharedProperties* properties);
+                        const Window::SharedProperties* properties,
+                        bool container = false);
 
   // Sets the mojom::WindowTree implementation.
   void SetWindowTree(mojom::WindowTreePtr window_tree_ptr);
 
   // Called when the mojom::WindowTree connection is lost, deletes this.
   void OnConnectionLost();
 
   // OnEmbed() calls into this. Exposed as a separate function for testing.
   void OnEmbedImpl(mojom::WindowTree* window_tree,
                    ClientSpecificId client_id,
@@ skipping 23 matching lines @@
   void OnUnembed(Id window_id) override;
   void OnCaptureChanged(Id new_capture_window_id,
                         Id old_capture_window_id) override;
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr data,
                          int64_t display_id,
                          bool drawn) override;
   void OnWindowBoundsChanged(Id window_id,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
+  void OnWindowSurfaceCreated(
+      Id window_id,
+      const gfx::Size& size,
+      float device_scale_factor,
+      const cc::SurfaceId& surface_id,
+      const cc::SurfaceSequence& surface_sequence) override;
   void OnClientAreaChanged(
       uint32_t window_id,
       const gfx::Insets& new_client_area,
       mojo::Array<gfx::Rect> new_additional_client_areas) override;
   void OnTransientWindowAdded(uint32_t window_id,
                               uint32_t transient_window_id) override;
   void OnTransientWindowRemoved(uint32_t window_id,
                                 uint32_t transient_window_id) override;
   void OnWindowHierarchyChanged(
       Id window_id,
@@ skipping 171 matching lines @@
   std::set<Id> drag_entered_windows_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_