[Ozone-DRI] Assume window IPC arrives before surface IPC

ui/ozone/platform/dri/dri_gpu_platform_support.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 "ui/ozone/platform/dri/dri_gpu_platform_support.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/thread_task_runner_handle.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 211 matching lines @@
   if (!handled)
     for (size_t i = 0; i < handlers_.size(); ++i)
       if (handlers_[i]->OnMessageReceived(message))
         return true;
 
   return false;
 }
 
 void DriGpuPlatformSupport::OnCreateWindowDelegate(
     gfx::AcceleratedWidget widget) {
-  // Due to how the GPU process starts up this IPC call may happen after the IPC
-  // to create a surface. Since a surface wants to know the window associated
-  // with it, we create it ahead of time. So when this call happens we do not
-  // create a delegate if it already exists.
-  if (!window_manager_->HasWindowDelegate(widget)) {
-    scoped_ptr<DriWindowDelegate> delegate(new DriWindowDelegateImpl(
-        widget, drm_, window_manager_, screen_manager_));
-    delegate->Initialize();
-    window_manager_->AddWindowDelegate(widget, delegate.Pass());
-  }
+  scoped_ptr<DriWindowDelegate> delegate(new DriWindowDelegateImpl(
+      widget, drm_, window_manager_, screen_manager_));
+  delegate->Initialize();
+  window_manager_->AddWindowDelegate(widget, delegate.Pass());
 }
 
 void DriGpuPlatformSupport::OnDestroyWindowDelegate(
     gfx::AcceleratedWidget widget) {
   scoped_ptr<DriWindowDelegate> delegate =
       window_manager_->RemoveWindowDelegate(widget);
   delegate->Shutdown();
 }
 
 void DriGpuPlatformSupport::OnWindowBoundsChanged(gfx::AcceleratedWidget widget,
@@ skipping 115 matching lines @@
     helper_thread_.Initialize();
     drm_->InitializeTaskRunner(helper_thread_.task_runner());
   }
 }
 
 IPC::MessageFilter* DriGpuPlatformSupport::GetMessageFilter() {
   return filter_.get();
 }
 
 }  // namespace ui