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 cc::LocalFrameId& revert_local_frame_id)
     : InFlightChange(window, ChangeType::BOUNDS),
       window_tree_client_(window_tree_client),
-      revert_bounds_(revert_bounds) {}
+      revert_bounds_(revert_bounds),
+      revert_local_frame_id_(revert_local_frame_id) {}
 
 void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
   revert_bounds_ =
       static_cast<const InFlightBoundsChange&>(change).revert_bounds_;
 }
 
 void InFlightBoundsChange::Revert() {
-  window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_);
+  // TODO(fsamuel): use proper LocalFrameId.
+  fprintf(stderr, ">>>%s window->server_id: %d\n", __PRETTY_FUNCTION__,
+          window()->server_id());
+  window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_,
+                                                 revert_local_frame_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 181 matching lines @@
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
   // TODO: need to support more than just off. http://crbug.com/660073.
   window()->GetWindow()->SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
 }
 
 }  // namespace aura