Pass root ServerWindow id to FrameGenerator.

services/ui/ws/display.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 16 matching lines @@
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/base/cursor/cursor.h"
 
 namespace ui {
 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 id to PlatformDisplay.

[Fady Samuel, 2016/10/26 14:33:45]

nit: drop id.

[kylechar, 2016/10/26 14:58:59]

Done.

+  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);
   window_server_->user_id_tracker()->AddObserver(this);
 }
 
 Display::~Display() {
   window_server_->user_id_tracker()->RemoveObserver(this);
 
   window_server_->window_manager_window_tree_factory_set()->RemoveObserver(
@@ skipping 346 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui