Fix ws::Display initialization order.

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 <utility>
+
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/ipc/quads.mojom.h"
 #include "cc/output/copy_output_request.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/ws/platform_display_factory.h"
@@ skipping 19 matching lines @@
 #endif
 
 namespace ui {
 
 namespace ws {
 
 // static
 PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr;
 
 // static
-PlatformDisplay* PlatformDisplay::Create(
+std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
     const PlatformDisplayInitParams& init_params) {
   if (factory_)
     return factory_->CreatePlatformDisplay();
 
-  return new DefaultPlatformDisplay(init_params);
+  return base::MakeUnique<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.root_window)),
       metrics_(init_params.metrics) {
@@ skipping 187 matching lines @@
 void DefaultPlatformDisplay::OnWindowStateChanged(
     ui::PlatformWindowState new_state) {}
 
 void DefaultPlatformDisplay::OnLostCapture() {
   delegate_->OnNativeCaptureLost();
 }
 
 void DefaultPlatformDisplay::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget,
     float device_scale_factor) {
+  // This will get called after Init() is called, either synchronously as part
+  // of the Init() callstack or async after Init() has returned, depending on
+  // the platform.
+  delegate_->OnAcceleratedWidgetAvailable();
   frame_generator_->OnAcceleratedWidgetAvailable(widget);
 }
 
 void DefaultPlatformDisplay::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void DefaultPlatformDisplay::OnActivationChanged(bool active) {}
 
 bool DefaultPlatformDisplay::IsInHighContrastMode() {
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 }  // namespace ws
 
 }  // namespace ui