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 "ui/aura/mus/window_tree_client.h" | 5 #include "ui/aura/mus/window_tree_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 void WindowTreeClient::ScheduleInFlightBoundsChange( | 690 void WindowTreeClient::ScheduleInFlightBoundsChange( |
691 WindowMus* window, | 691 WindowMus* window, |
692 const gfx::Rect& old_bounds, | 692 const gfx::Rect& old_bounds, |
693 const gfx::Rect& new_bounds) { | 693 const gfx::Rect& new_bounds) { |
694 const uint32_t change_id = | 694 const uint32_t change_id = |
695 ScheduleInFlightChange(base::MakeUnique<InFlightBoundsChange>( | 695 ScheduleInFlightChange(base::MakeUnique<InFlightBoundsChange>( |
696 this, window, old_bounds, window->GetLocalSurfaceId())); | 696 this, window, old_bounds, window->GetLocalSurfaceId())); |
697 base::Optional<cc::LocalSurfaceId> local_surface_id; | 697 base::Optional<cc::LocalSurfaceId> local_surface_id; |
698 if (window->window_mus_type() == WindowMusType::TOP_LEVEL_IN_WM || | 698 if (window->window_mus_type() == WindowMusType::TOP_LEVEL_IN_WM || |
699 window->window_mus_type() == WindowMusType::EMBED_IN_OWNER || | 699 window->window_mus_type() == WindowMusType::EMBED_IN_OWNER || |
700 window->window_mus_type() == WindowMusType::DISPLAY_MANUALLY_CREATED) { | 700 window->window_mus_type() == WindowMusType::DISPLAY_MANUALLY_CREATED || |
| 701 window->HasLocalCompositorFrameSink()) { |
701 local_surface_id = window->GetOrAllocateLocalSurfaceId(new_bounds.size()); | 702 local_surface_id = window->GetOrAllocateLocalSurfaceId(new_bounds.size()); |
702 synchronizing_with_child_on_next_frame_ = true; | 703 synchronizing_with_child_on_next_frame_ = true; |
703 } | 704 } |
704 tree_->SetWindowBounds(change_id, window->server_id(), new_bounds, | 705 tree_->SetWindowBounds(change_id, window->server_id(), new_bounds, |
705 local_surface_id); | 706 local_surface_id); |
706 } | 707 } |
707 | 708 |
708 void WindowTreeClient::OnWindowMusCreated(WindowMus* window) { | 709 void WindowTreeClient::OnWindowMusCreated(WindowMus* window) { |
709 if (window->server_id() != kInvalidServerId) | 710 if (window->server_id() != kInvalidServerId) |
710 return; | 711 return; |
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2140 } | 2141 } |
2141 | 2142 |
2142 void WindowTreeClient::OnCompositingLockStateChanged( | 2143 void WindowTreeClient::OnCompositingLockStateChanged( |
2143 ui::Compositor* compositor) {} | 2144 ui::Compositor* compositor) {} |
2144 | 2145 |
2145 void WindowTreeClient::OnCompositingShuttingDown(ui::Compositor* compositor) { | 2146 void WindowTreeClient::OnCompositingShuttingDown(ui::Compositor* compositor) { |
2146 compositor->RemoveObserver(this); | 2147 compositor->RemoveObserver(this); |
2147 } | 2148 } |
2148 | 2149 |
2149 } // namespace aura | 2150 } // namespace aura |
OLD | NEW |