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

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

Issue 2445873003: Pass root ServerWindow id to FrameGenerator. (Closed)
Patch Set: Address nits. Created 4 years, 2 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 | « services/ui/ws/display.h ('k') | services/ui/ws/frame_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/display.cc
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index f11f959aa50f8c5a9b92abd93162f39a2f22c028..175529ca5ff8bae80e57f2a5f5c47a8de629665b 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -34,9 +34,13 @@ namespace ws {
Display::Display(WindowServer* window_server,
const PlatformDisplayInitParams& platform_display_init_params)
- : window_server_(window_server),
- platform_display_(PlatformDisplay::Create(platform_display_init_params)),
- last_cursor_(mojom::Cursor::CURSOR_NULL) {
+ : window_server_(window_server), last_cursor_(mojom::Cursor::CURSOR_NULL) {
+ CreateRootWindow(platform_display_init_params.metrics.bounds.size());
+
+ // Pass the display root ServerWindow to PlatformDisplay.
+ PlatformDisplayInitParams param_copy = platform_display_init_params;
+ param_copy.root_window = root_.get();
+ platform_display_.reset(PlatformDisplay::Create(param_copy));
platform_display_->Init(this);
window_server_->window_manager_window_tree_factory_set()->AddObserver(this);
« no previous file with comments | « services/ui/ws/display.h ('k') | services/ui/ws/frame_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698