VaapiVideoAccelerator: make Vaapi accelerator work with ozone

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>
 
@@ skipping 97 matching lines @@
   }
   virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
     return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy(
         gpu_platform_support_host_.get(), device_manager_.get()));
   }
   virtual void InitializeUI() override {
     vt_manager_.reset(new VirtualTerminalManager());
     // Needed since the browser process creates the accelerated widgets and that
     // happens through SFO.
-    surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
+    if (!surface_factory_ozone_)

[kalyank, 2014/11/01 19:28:35]

Why is this needed ?

[llandwerlin-old, 2014/11/03 09:30:11]

We don't want to initialize the surface factory twice (when calling InitializeUI
and InitializeGPU).

[kalyank, 2014/11/04 01:04:19]

This should be the case only when in single process mode, other wise we should
be initializing them in different process (InitializeUI should be called from
Browser process and GPU from GPU process respectively.) Even in single process
case, UI should be called first and then GPU. I think we should avoid this
change as part of this CL and move it to a separate CL.
spang ^

[dnicoara, 2014/11/04 01:26:27]

When running in-process, InitializeUI() should be called first, that's why the
if-statement is present in InitializeGPU().

[kalyank, 2014/11/04 16:45:10]

Ya, so we don't need this change basically.

+      surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
     device_manager_ = CreateDeviceManager();
     gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
     window_manager_.reset(
         new DriWindowManager(gpu_platform_support_host_.get()));
     event_factory_ozone_.reset(new EventFactoryEvdev(window_manager_->cursor(),
                                                      device_manager_.get()));
   }
 
   virtual void InitializeGPU() override {
@@ skipping 44 matching lines @@
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformGbm() {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   return new OzonePlatformGbm(cmd->HasSwitch(switches::kOzoneUseSurfaceless));
 }
 
 }  // namespace ui