| Index: ui/aura/mus/in_flight_change.cc
|
| diff --git a/ui/aura/mus/in_flight_change.cc b/ui/aura/mus/in_flight_change.cc
|
| index 3b369a5455de92448725dd894aa1e13afb833818..909d718c1e814ce8879801bd476f173741aba3d2 100644
|
| --- a/ui/aura/mus/in_flight_change.cc
|
| +++ b/ui/aura/mus/in_flight_change.cc
|
| @@ -31,12 +31,15 @@ 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_ =
|
| @@ -44,7 +47,11 @@ void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
|
| }
|
|
|
| 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 -----------------------------------------------------
|
|
|