[Ozone-GBM] Adding NativeWindowDelegate to IPC window changes to the GPU

ui/ozone/platform/dri/ozone_platform_gbm.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/ozone_platform_gbm.h"
 
 #include <dlfcn.h>
 #include <gbm.h>
 #include <stdlib.h>
 
 #include "base/at_exit.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/ozone/platform/dri/cursor_factory_evdev_dri.h"
 #include "ui/ozone/platform/dri/dri_window.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
 #include "ui/ozone/platform/dri/gbm_surface_factory.h"
 #include "ui/ozone/platform/dri/gpu_platform_support_gbm.h"
 #include "ui/ozone/platform/dri/gpu_platform_support_host_gbm.h"
+#include "ui/ozone/platform/dri/native_window_manager.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/platform/dri/virtual_terminal_manager.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/ozone_platform.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"
@@ skipping 99 matching lines @@
     buffer_generator_.reset(new GbmBufferGenerator(dri_.get()));
     screen_manager_.reset(new ScreenManager(dri_.get(),
                                             buffer_generator_.get()));
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
     surface_factory_ozone_->InitializeGpu(dri_.get(),
                                           buffer_generator_->device(),
                                           screen_manager_.get());
     gpu_platform_support_.reset(
-        new GpuPlatformSupportGbm(surface_factory_ozone_.get()));
+        new GpuPlatformSupportGbm(surface_factory_ozone_.get(),
+                                  &gpu_window_manager_,
+                                  screen_manager_.get()));
 #if defined(OS_CHROMEOS)
     gpu_platform_support_->AddHandler(scoped_ptr<GpuPlatformSupport>(
         new DisplayMessageHandler(
             scoped_ptr<NativeDisplayDelegateDri>(new NativeDisplayDelegateDri(
                 dri_.get(),
                 screen_manager_.get(),
                 NULL)))));
 #endif
     if (surface_factory_ozone_->InitializeHardware() !=
         DriSurfaceFactory::INITIALIZED)
       LOG(FATAL) << "failed to initialize display hardware";
   }
 
  private:
   bool use_surfaceless_;
   scoped_ptr<VirtualTerminalManager> vt_manager_;
   scoped_ptr<DriWrapper> dri_;
   scoped_ptr<GbmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
   scoped_ptr<DeviceManager> device_manager_;
 
   scoped_ptr<GbmSurfaceFactory> surface_factory_ozone_;
   scoped_ptr<CursorFactoryEvdevDri> cursor_factory_ozone_;
   scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
 
   scoped_ptr<GpuPlatformSupportGbm> gpu_platform_support_;
   scoped_ptr<GpuPlatformSupportHostGbm> gpu_platform_support_host_;
 
+  NativeWindowManager gpu_window_manager_;

[spang, 2014/08/18 19:31:30]

the variable name is way better than the class name

[dnicoara, 2014/08/19 15:53:38]

In this context, I wanted to show where this is used. In the next CL I'd have a
|ui_window_manager_| for the browser side one.

As for the class name, I'm not fond of GpuWindowManager, especially when it will
be instantiated on both the Browser and GPU process.

How about DriWindowManager? At least that's going to be in-sync with the
DriWindow naming.

+
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformGbm() {
   return new OzonePlatformGbm(false);
 }
 OzonePlatform* CreateOzonePlatformGbmEglImage() {
   return new OzonePlatformGbm(true);
 }
 
 }  // namespace ui