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

Unified Diff: services/ui/ws/window_server.cc

Issue 2875753002: Implement aura::WindowPortMus::CreateCompositorFrameSink() (Closed)
Patch Set: Fix build problem 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
« no previous file with comments | « components/viz/client/client_compositor_frame_sink.cc ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index 2aaa85eb5d3735878584d027b3735bc6883e6e48..322cb0ce6bbd4d3024a18f7a0086dd81b07a1abd 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -882,10 +882,9 @@ void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
HandleTemporaryReferenceForNewSurface(surface_info.id(), window);
- if (!window->parent())
- return;
-
- WindowTree* window_tree = GetTreeWithId(window->parent()->id().client_id);
+ // We always use the owner of the window's id (even for an embedded window),
+ // because an embedded window's id is allocated by the parent's window tree.
+ WindowTree* window_tree = GetTreeWithId(window->id().client_id);
if (window_tree)
window_tree->ProcessWindowSurfaceChanged(window, surface_info);
}
« no previous file with comments | « components/viz/client/client_compositor_frame_sink.cc ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698