Change NativeBufferOzone to be an object and move the overlay calls to the surface object.

ui/ozone/platform/dri/gbm_surface_factory.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/gbm_surface_factory.h"
 
 #include <EGL/egl.h>
 #include <gbm.h>
 
 #include "base/files/file_path.h"
 #include "ui/ozone/platform/dri/buffer_data.h"
 #include "ui/ozone/platform/dri/dri_vsync_provider.h"
+#include "ui/ozone/platform/dri/gbm_buffer.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_surface.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
 namespace {
 
 class GbmSurfaceAdapter : public ui::SurfaceOzoneEGL {
  public:
   GbmSurfaceAdapter(const base::WeakPtr<HardwareDisplayController>& controller);
   virtual ~GbmSurfaceAdapter();
 
   // SurfaceOzoneEGL:
   virtual intptr_t GetNativeWindow() OVERRIDE;
   virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE;
   virtual bool OnSwapBuffers() OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
+  virtual bool ScheduleOverlayPlane(int plane_z_order,
+                                    gfx::OverlayTransform plane_transform,
+                                    ui::NativePixmap* buffer,
+                                    const gfx::Rect& display_bounds,
+                                    const gfx::RectF& crop_rect) OVERRIDE;
 
  private:
   base::WeakPtr<HardwareDisplayController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceAdapter);
 };
 
 GbmSurfaceAdapter::GbmSurfaceAdapter(
     const base::WeakPtr<HardwareDisplayController>& controller)
     : controller_(controller) {}
@@ skipping 19 matching lines @@
 
   static_cast<GbmSurface*>(controller_->surface())->LockCurrentDrawable();
   if (controller_->SchedulePageFlip()) {
     controller_->WaitForPageFlipEvent();
     return true;
   }
 
   return false;
 }
 
+bool GbmSurfaceAdapter::ScheduleOverlayPlane(
+    int plane_z_order,
+    gfx::OverlayTransform plane_transform,
+    ui::NativeBufferOzone buffer,
+    const gfx::Rect& display_bounds,
+    const gfx::RectF& crop_rect) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 scoped_ptr<gfx::VSyncProvider> GbmSurfaceAdapter::CreateVSyncProvider() {
   return scoped_ptr<gfx::VSyncProvider>(new DriVSyncProvider(controller_));
 }
 
 }  // namespace
 
 GbmSurfaceFactory::GbmSurfaceFactory(DriWrapper* dri,
                                      gbm_device* device,
                                      ScreenManager* screen_manager)
     : DriSurfaceFactory(dri, screen_manager),
@@ skipping 63 matching lines @@
 
 scoped_ptr<ui::SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget w) {
   CHECK(state_ == INITIALIZED);
   ResetCursor(w);
 
   return scoped_ptr<ui::SurfaceOzoneEGL>(
       new GbmSurfaceAdapter(screen_manager_->GetDisplayController(w)));
 }
 
-ui::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
+scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativeBuffer(
     gfx::Size size,
     BufferFormat format) {
-  uint32_t gbm_format = 0;
-  switch (format) {
-    case SurfaceFactoryOzone::UNKNOWN:
-      return 0;
-    // TODO(alexst): Setting this to XRGB for now to allow presentation
-    // as a primary plane but disallowing overlay transparency. Address this
-    // to allow both use cases.
-    case SurfaceFactoryOzone::RGBA_8888:
-      gbm_format = GBM_FORMAT_XRGB8888;
-      break;
-    case SurfaceFactoryOzone::RGB_888:
-      gbm_format = GBM_FORMAT_RGB888;
-      break;
+  scoped_refptr<GbmBuffer> buf = new GbmBuffer(device_, dri_, size);
+  if (!buf->InitializeBuffer(format, true)) {
+     return NULL;
   }
-  gbm_bo* buffer_object =
-      gbm_bo_create(device_,
-                    size.width(),
-                    size.height(),
-                    gbm_format,
-                    GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
-  if (!buffer_object)
-    return 0;
-
-  BufferData* data = BufferData::CreateData(drm_, buffer_object);
-  DCHECK(data) << "Failed to associate the buffer with the controller";
-
-  return reinterpret_cast<ui::NativeBufferOzone>(buffer_object);
+  return buf;
 }
 
 }  // namespace ui