ozone: gbm: Add overlay support

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/ozone_platform.h"
 #include "ui/ozone/platform/dri/cursor_factory_evdev_dri.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/scanout_surface.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"
@@ skipping 20 matching lines @@
     if (glapi_lib_)
       dlclose(glapi_lib_);
   }
 
   gbm_device* device() const { return device_; }
 
   virtual ScanoutSurface* Create(const gfx::Size& size) OVERRIDE {
     return new GbmSurface(device_, dri_, size);
   }
 
- private:
+ protected:
   DriWrapper* dri_;  // Not owned.
 
   // HACK: gbm drivers have broken linkage
   void *glapi_lib_;
 
   gbm_device* device_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceGenerator);
 };
 
+class GbmEglImageSurfaceGenerator : public GbmSurfaceGenerator {
+ public:
+  GbmEglImageSurfaceGenerator(DriWrapper* dri) : GbmSurfaceGenerator(dri) {}
+  virtual ~GbmEglImageSurfaceGenerator() {}
+
+  virtual ScanoutSurface* Create(const gfx::Size& size) OVERRIDE {
+    GbmBuffer* buffer = new GbmBuffer(device_, dri_, size);
+    if (!buffer->InitializeBuffer(SurfaceFactoryOzone::RGBA_8888, true)) {
+      ScanoutSurface* surf = buffer;

[alexst (slow to review), 2014/07/08 17:22:32]

Why the temp assignment here?

[achaulk, 2014/07/08 18:16:37]

GbmBuffer is non-deletable because of the refcounted base class, but
ScanoutSurface is. We can't pass back a NativePixmap reference here either
because not all surfaces are pixmaps.

[alexst (slow to review), 2014/07/08 21:28:37]

I see. It's subtle, though, can we make something like this work instead?

scoped_ptr<GbmBuffer> buffer = ...
if(!init) {
  return NULL;
}
return buffer->release();

[achaulk, 2014/07/08 21:36:12]

I suppose that works just as well. We already have a "refcounted" object that is
really only refcounted some of the time, so there shouldn't be any harm in
making it just straight up deletable.

[achaulk, 2014/07/08 21:38:52]

I spoke too soon. Compiler says no

../../base/macros.h:160:35: error: static assertion failed:
T_is_refcounted_type_and_needs_scoped_refptr
 #define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
                                   ^
../../base/memory/scoped_ptr.h:313:3: note: in expansion of macro
'COMPILE_ASSERT'
   COMPILE_ASSERT(base::internal::IsNotRefCounted<T>::value,

We also can't use a scoped_refptr because ScanoutSurface is not also refcounted
(and cannot be using our refcounted template base)

+      delete surf;
+      return NULL;
+    }
+    return buffer;
+  }
+};
+
 class OzonePlatformGbm : public OzonePlatform {
  public:
-  OzonePlatformGbm() {
+  OzonePlatformGbm(bool use_surfaceless) : use_surfaceless_(use_surfaceless) {
      base::AtExitManager::RegisterTask(
         base::Bind(&base::DeletePointer<OzonePlatformGbm>, this));
   }
   virtual ~OzonePlatformGbm() {}
 
   // OzonePlatform:
   virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {
     return surface_factory_ozone_.get();
   }
   virtual EventFactoryOzone* GetEventFactoryOzone() OVERRIDE {
@@ skipping 16 matching lines @@
   virtual scoped_ptr<TouchscreenDeviceManager>
       CreateTouchscreenDeviceManager() OVERRIDE {
     return scoped_ptr<TouchscreenDeviceManager>(
         new TouchscreenDeviceManagerOzone());
   }
 #endif
   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());
+    surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
     device_manager_ = CreateDeviceManager();
     gpu_platform_support_host_.reset(new GpuPlatformSupportHostGbm());
     cursor_factory_ozone_.reset(
         new CursorFactoryEvdevDri(gpu_platform_support_host_.get()));
     event_factory_ozone_.reset(new EventFactoryEvdev(
         cursor_factory_ozone_.get(), device_manager_.get()));
   }
 
   virtual void InitializeGPU() OVERRIDE {
     dri_.reset(new DriWrapper(kDefaultGraphicsCardPath));
-    surface_generator_.reset(new GbmSurfaceGenerator(dri_.get()));
+    if (use_surfaceless_)
+      surface_generator_.reset(new GbmEglImageSurfaceGenerator(dri_.get()));
+    else
+      surface_generator_.reset(new GbmSurfaceGenerator(dri_.get()));
     screen_manager_.reset(new ScreenManager(dri_.get(),
                                             surface_generator_.get()));
     if (!surface_factory_ozone_)
-      surface_factory_ozone_.reset(new GbmSurfaceFactory());
+      surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
     surface_factory_ozone_->InitializeGpu(dri_.get(),
                                           surface_generator_->device(),
                                           screen_manager_.get());
 
     gpu_platform_support_.reset(
         new GpuPlatformSupportGbm(surface_factory_ozone_.get()));
   }
 
  private:
+  bool use_surfaceless_;
   scoped_ptr<VirtualTerminalManager> vt_manager_;
   scoped_ptr<DriWrapper> dri_;
   scoped_ptr<GbmSurfaceGenerator> surface_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_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };
 
 }  // namespace
 
-OzonePlatform* CreateOzonePlatformGbm() { return new OzonePlatformGbm; }
+OzonePlatform* CreateOzonePlatformGbm() {
+  return new OzonePlatformGbm(false);
+}
+OzonePlatform* CreateOzonePlatformGbmEglImage() {
+  return new OzonePlatformGbm(true);
+}
 
 }  // namespace ui