WIP: Surface Synchronization System

ui/aura/mus/in_flight_change.cc

 // 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.
 
 #include "ui/aura/mus/in_flight_change.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_mus.h"
@@ skipping 13 matching lines @@
 
 bool InFlightChange::Matches(const InFlightChange& change) const {
   DCHECK(change.window_ == window_ && change.change_type_ == change_type_);
   return true;
 }
 
 void InFlightChange::ChangeFailed() {}
 
 // InFlightBoundsChange -------------------------------------------------------
 
-InFlightBoundsChange::InFlightBoundsChange(WindowTreeClient* window_tree_client,
-                                           WindowMus* window,
-                                           const gfx::Rect& revert_bounds)
+InFlightBoundsChange::InFlightBoundsChange(
+    WindowTreeClient* window_tree_client,
+    WindowMus* window,
+    const gfx::Rect& revert_bounds,
+    const base::Optional<cc::LocalSurfaceId>& revert_local_surface_id)
     : InFlightChange(window, ChangeType::BOUNDS),
       window_tree_client_(window_tree_client),
-      revert_bounds_(revert_bounds) {}
+      revert_bounds_(revert_bounds),
+      revert_local_surface_id_(revert_local_surface_id) {}
+
+InFlightBoundsChange::~InFlightBoundsChange() {}
 
 void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
   revert_bounds_ =
       static_cast<const InFlightBoundsChange&>(change).revert_bounds_;
+  revert_local_surface_id_ =
+      static_cast<const InFlightBoundsChange&>(change).revert_local_surface_id_;
 }
 
 void InFlightBoundsChange::Revert() {
-  window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_);
+  window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_,
+                                                 revert_local_surface_id_);
 }
 
 // InFlightDragChange -----------------------------------------------------
 
 InFlightDragChange::InFlightDragChange(WindowMus* window, ChangeType type)
     : InFlightChange(window, type) {
   DCHECK(type == ChangeType::MOVE_LOOP || type == ChangeType::DRAG_LOOP);
 }
 
 void InFlightDragChange::SetRevertValueFrom(const InFlightChange& change) {}
@@ skipping 188 matching lines @@
     const InFlightChange& change) {
   revert_modal_type_ =
       static_cast<const InFlightSetModalTypeChange&>(change).revert_modal_type_;
 }
 
 void InFlightSetModalTypeChange::Revert() {
   window()->GetWindow()->SetProperty(client::kModalKey, revert_modal_type_);
 }
 
 }  // namespace aura