Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/mus/public/cpp/lib/window_tree_client_impl.h" | 5 #include "components/mus/public/cpp/lib/window_tree_client_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 554 WindowPrivate(window).LocalDestroy(); | 554 WindowPrivate(window).LocalDestroy(); |
| 555 } | 555 } |
| 556 | 556 |
| 557 void WindowTreeClientImpl::OnTopLevelCreated(uint32_t change_id, | 557 void WindowTreeClientImpl::OnTopLevelCreated(uint32_t change_id, |
| 558 mojom::WindowDataPtr data) { | 558 mojom::WindowDataPtr data) { |
| 559 // The server ack'd the top level window we created and supplied the state | 559 // The server ack'd the top level window we created and supplied the state |
| 560 // of the window at the time the server created it. For properties we do not | 560 // of the window at the time the server created it. For properties we do not |
| 561 // have changes in flight for we can update them immediately. For properties | 561 // have changes in flight for we can update them immediately. For properties |
| 562 // with changes in flight we set the revert value from the server. | 562 // with changes in flight we set the revert value from the server. |
| 563 | 563 |
| 564 if (!in_flight_map_.count(change_id)) // XXX(sad): ?? | |
|
sky
2016/02/03 22:43:48
This early out indicates something is wrong. How a
sadrul
2016/02/04 00:03:42
I have no idea why I am hitting this, but I hit th
| |
| 565 return; | |
| 564 scoped_ptr<InFlightChange> change(std::move(in_flight_map_[change_id])); | 566 scoped_ptr<InFlightChange> change(std::move(in_flight_map_[change_id])); |
| 565 in_flight_map_.erase(change_id); | 567 in_flight_map_.erase(change_id); |
| 566 DCHECK(change); | 568 DCHECK(change); |
| 567 | 569 |
| 568 Window* window = change->window(); | 570 Window* window = change->window(); |
| 569 WindowPrivate window_private(window); | 571 WindowPrivate window_private(window); |
| 570 | 572 |
| 571 // Drawn state and ViewportMetrics always come from the server (they can't | 573 // Drawn state and ViewportMetrics always come from the server (they can't |
| 572 // be modified locally). | 574 // be modified locally). |
| 573 window_private.set_drawn(data->drawn); | 575 window_private.set_drawn(data->drawn); |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 927 | 929 |
| 928 void WindowTreeClientImpl::SetUnderlaySurfaceOffsetAndExtendedHitArea( | 930 void WindowTreeClientImpl::SetUnderlaySurfaceOffsetAndExtendedHitArea( |
| 929 Window* window, | 931 Window* window, |
| 930 const gfx::Vector2d& offset, | 932 const gfx::Vector2d& offset, |
| 931 const gfx::Insets& hit_area) { | 933 const gfx::Insets& hit_area) { |
| 932 window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea( | 934 window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea( |
| 933 window->id(), offset.x(), offset.y(), mojo::Insets::From(hit_area)); | 935 window->id(), offset.x(), offset.y(), mojo::Insets::From(hit_area)); |
| 934 } | 936 } |
| 935 | 937 |
| 936 } // namespace mus | 938 } // namespace mus |
| OLD | NEW |