WIP: Surface Synchronization System

ui/aura/mus/window_tree_client.h

Index: ui/aura/mus/window_tree_client.h
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h
index 130d90c00689e20ad04f509f80e091b2616c98f6..a7fb238c82da2c5fbeea8c4bc53280eba2eb0475 100644
--- a/ui/aura/mus/window_tree_client.h
+++ b/ui/aura/mus/window_tree_client.h
@@ -18,6 +18,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "cc/surfaces/local_surface_id_allocator.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
@@ -275,8 +276,10 @@ class AURA_EXPORT WindowTreeClient
 
   // Called when a property needs to change as the result of a change in the
   // server, or the server failing to accept a change.
-  void SetWindowBoundsFromServer(WindowMus* window,
-                                 const gfx::Rect& revert_bounds_in_pixels);
+  void SetWindowBoundsFromServer(
+      WindowMus* window,
+      const gfx::Rect& revert_bounds_in_pixels,
+      const base::Optional<cc::LocalSurfaceId>& local_surface_id);
   void SetWindowVisibleFromServer(WindowMus* window, bool visible);
 
   // Called from OnWindowMusBoundsChanged() and SetRootWindowBounds().
@@ -393,6 +396,10 @@ class AURA_EXPORT WindowTreeClient
                                   bool success,
                                   uint32_t action_taken) override;
   void OnDragDropDone() override;
+  void OnSetWindowBoundsResponse(
+      uint32_t change_id,
+      const gfx::Rect& bounds,
+      const cc::LocalSurfaceId& local_surface_id) override;
   void OnChangeCompleted(uint32_t change_id, bool success) override;
   void RequestClose(uint32_t window_id) override;
   void GetWindowManager(
@@ -540,6 +547,8 @@ class AURA_EXPORT WindowTreeClient
 
   bool in_destructor_;
 
+  bool enable_surface_synchronization_ = false;
+
   // A mapping to shared memory that is one 32 bit integer long. The window
   // server uses this to let us synchronously read the cursor location.
   mojo::ScopedSharedBufferMapping cursor_location_mapping_;