Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: ui/aura/mus/window_tree_client.cc

Issue 2875753002: Implement aura::WindowPortMus::CreateCompositorFrameSink() (Closed)
Patch Set: Address review issues Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/aura/mus/window_port_mus.cc ('K') | « ui/aura/mus/window_port_mus.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_tree_client.cc
diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
index 89481a1e81c78697e05993ded5a0e68043baa271..d73ad162c10d8ab9bd246116cca2d95f2487a30f 100644
--- a/ui/aura/mus/window_tree_client.cc
+++ b/ui/aura/mus/window_tree_client.cc
@@ -700,6 +700,12 @@ void WindowTreeClient::ScheduleInFlightBoundsChange(
window->window_mus_type() == WindowMusType::DISPLAY_MANUALLY_CREATED) {
local_surface_id = window->GetOrAllocateLocalSurfaceId(new_bounds.size());
synchronizing_with_child_on_next_frame_ = true;
+ } else if (window->window_mus_type() == WindowMusType::LOCAL) {
Fady Samuel 2017/06/07 20:36:11 if it has a CompositorFrameSink then do this...
Peng 2017/06/07 21:14:29 Done.
+ auto id = window->GetOrAllocateLocalSurfaceId(new_bounds.size());
+ if (id.is_valid()) {
+ local_surface_id = id;
+ synchronizing_with_child_on_next_frame_ = true;
+ }
}
tree_->SetWindowBounds(change_id, window->server_id(), new_bounds,
local_surface_id);
@@ -1412,12 +1418,6 @@ void WindowTreeClient::OnWindowSurfaceChanged(
WindowMus* window = GetWindowByServerId(window_id);
if (!window)
return;
-
- // If the parent is informed of a child's surface then that surface ID is
- // guaranteed to be available in the display compositor so we set it as the
- // fallback. If surface synchronization is enabled, the primary SurfaceInfo
- // is created by the embedder, and the LocalSurfaceId is allocated by the
- // embedder.
window->SetFallbackSurfaceInfo(surface_info);
}
« ui/aura/mus/window_port_mus.cc ('K') | « ui/aura/mus/window_port_mus.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698