Pass root ServerWindow id to FrameGenerator.

services/ui/ws/platform_display.cc

 // Copyright 2014 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/platform_display.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/ipc/quads.mojom.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 40 matching lines @@
 
   return new DefaultPlatformDisplay(init_params);
 }
 
 DefaultPlatformDisplay::DefaultPlatformDisplay(
     const PlatformDisplayInitParams& init_params)
     : id_(init_params.display_id),
 #if !defined(OS_ANDROID)
       cursor_loader_(ui::CursorLoader::Create()),
 #endif
-      frame_generator_(
-          new FrameGenerator(this, init_params.display_compositor)),
+      frame_generator_(new FrameGenerator(this,
+                                          init_params.root_window,
+                                          init_params.display_compositor)),
       metrics_(init_params.metrics) {
 }
 
 void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
   delegate_ = delegate;
 
   DCHECK(!metrics_.pixel_size.IsEmpty());
 
   // TODO(kylechar): The origin here isn't right if any displays have
   // scale_factor other than 1.0 but will prevent windows from being stacked.
   gfx::Rect bounds(metrics_.bounds.origin(), metrics_.pixel_size);
 #if defined(OS_WIN)
   platform_window_ = base::MakeUnique<ui::WinWindow>(this, bounds);
 #elif defined(USE_X11)
   platform_window_ = base::MakeUnique<ui::X11Window>(this);
 #elif defined(OS_ANDROID)
   platform_window_ = base::MakeUnique<ui::PlatformWindowAndroid>(this);
 #elif defined(USE_OZONE)
   platform_window_ =
       ui::OzonePlatform::GetInstance()->CreatePlatformWindow(this, bounds);
 #else
   NOTREACHED() << "Unsupported platform";
 #endif
-  delegate_->CreateRootWindow(metrics_.bounds.size());
 
   platform_window_->SetBounds(bounds);
   platform_window_->Show();
 }
 
 int64_t DefaultPlatformDisplay::GetId() const {
   return id_;
 }
 
 DefaultPlatformDisplay::~DefaultPlatformDisplay() {
@@ skipping 191 matching lines @@
   return delegate_->GetRootWindow();
 }
 
 bool DefaultPlatformDisplay::IsInHighContrastMode() {
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 }  // namespace ws
 
 }  // namespace ui