WIP: Surface Synchronization System

ui/aura/mus/in_flight_change.h

Index: ui/aura/mus/in_flight_change.h
diff --git a/ui/aura/mus/in_flight_change.h b/ui/aura/mus/in_flight_change.h
index 113a9e78c55ac0c9a7458122aee241841e44f9df..e5bf323195cc674c3650305d05824e46ec09d86a 100644
--- a/ui/aura/mus/in_flight_change.h
+++ b/ui/aura/mus/in_flight_change.h
@@ -13,6 +13,8 @@
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/optional.h"
+#include "cc/surfaces/local_surface_id.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/rect.h"
@@ -139,9 +141,12 @@ class InFlightChange {
 
 class InFlightBoundsChange : public InFlightChange {
  public:
-  InFlightBoundsChange(WindowTreeClient* window_tree_client,
-                       WindowMus* window,
-                       const gfx::Rect& revert_bounds);
+  InFlightBoundsChange(
+      WindowTreeClient* window_tree_client,
+      WindowMus* window,
+      const gfx::Rect& revert_bounds,
+      const base::Optional<cc::LocalSurfaceId>& local_surface_id);
+  ~InFlightBoundsChange() override;
 
   // InFlightChange:
   void SetRevertValueFrom(const InFlightChange& change) override;
@@ -150,6 +155,7 @@ class InFlightBoundsChange : public InFlightChange {
  private:
   WindowTreeClient* window_tree_client_;
   gfx::Rect revert_bounds_;
+  base::Optional<cc::LocalSurfaceId> revert_local_surface_id_;
 
   DISALLOW_COPY_AND_ASSIGN(InFlightBoundsChange);
 };