FrameGenerator should not be created until an AcceleratedWidget is available

services/ui/ws/platform_display_default.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/ws/frame_generator.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_delegate.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
 class ImageCursors;
 class PlatformWindow;
 
 namespace ws {
 
 // PlatformDisplay implementation that connects to a PlatformWindow and
 // FrameGenerator for Chrome OS.
 class PlatformDisplayDefault : public PlatformDisplay,
                                public ui::PlatformWindowDelegate,
-                               private FrameGeneratorDelegate {
+                               public FrameGeneratorDelegate {
  public:
   explicit PlatformDisplayDefault(const PlatformDisplayInitParams& init_params);
   ~PlatformDisplayDefault() override;
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
   int64_t GetId() const override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
@@ skipping 36 matching lines @@
 #if !defined(OS_ANDROID)
   std::unique_ptr<ui::ImageCursors> image_cursors_;
 #endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;
 
   display::ViewportMetrics metrics_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
   gfx::AcceleratedWidget widget_;
+  ServerWindow* root_window_;
+  float init_device_scale_factor_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_