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

ui/ozone/platform/dri/gbm_buffer.h

Index: ui/ozone/platform/dri/gbm_buffer.h
diff --git a/ui/ozone/platform/dri/gbm_buffer.h b/ui/ozone/platform/dri/gbm_buffer.h
new file mode 100644
index 0000000000000000000000000000000000000000..a9f58a22d1836f5f2db8b219bc7d19e09f743442
--- /dev/null
+++ b/ui/ozone/platform/dri/gbm_buffer.h
@@ -0,0 +1,56 @@
+// 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.
+
+#ifndef UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_
+#define UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/ozone/platform/dri/scanout_surface.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
+
+struct gbm_bo;
+struct gbm_device;
+
+namespace ui {
+
+class DriWrapper;
+
+class GbmBuffer : public NativePixmap, public ScanoutSurface {

[dnicoara, 2014/07/03 18:30:16]

Do you need to inherit from ScanoutSurface? I'm assuming you need this for your
next changes (maybe leave it for those changes?)

[achaulk, 2014/07/03 19:49:43]

Oh, yeah those are part of the next set of changes when HDC uses them. I can
leave it out for now

+ public:
+  GbmBuffer(gbm_device* device, DriWrapper* dri, const gfx::Size& size);
+
+  bool InitializeBuffer(SurfaceFactoryOzone::BufferFormat format,

[alexst (slow to review), 2014/07/03 18:30:32]

nit: these fit

+                        bool scanout);
+
+  // ScanoutSurface:
+  virtual bool Initialize() OVERRIDE;
+  virtual uint32_t GetFramebufferId() const OVERRIDE;
+  virtual uint32_t GetHandle() const OVERRIDE;
+  virtual gfx::Size Size() const OVERRIDE;
+  virtual void SwapBuffers() OVERRIDE;
+
+  // NativePixmap:
+  virtual void* native_handle() OVERRIDE;
+  virtual int dma_buf_fd() OVERRIDE;
+
+ protected:
+  virtual ~GbmBuffer();
+
+ private:
+  gbm_device* gbm_device_;
+  gbm_bo* bo_;
+
+  uint32_t handle_;
+  uint32_t framebuffer_;
+
+  DriWrapper* dri_;
+
+  gfx::Size size_;
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_DRI_GBM_BUFFER_H_