[Ozone-GBM] Migrate GBM buffers to use the ScanoutBuffer interface

ui/ozone/platform/dri/gbm_surface.h

 // 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_SURFACE_H_
 #define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/geometry/size.h"
@@ skipping 20 matching lines @@
   virtual bool Initialize() OVERRIDE;
   virtual uint32_t GetFramebufferId() const OVERRIDE;
   virtual uint32_t GetHandle() const OVERRIDE;
   virtual gfx::Size Size() const OVERRIDE;
   virtual void PreSwapBuffers() OVERRIDE;
   virtual void SwapBuffers() OVERRIDE;
 
   gbm_surface* native_surface() { return native_surface_; };
 
  private:
+  class GbmSurfaceBuffer;

[alexst (slow to review), 2014/07/18 21:11:31]

I would prefer you declared it here fully, it should be very small once the base
class is implemented. With just the forward declaration, it's unclear where to
go looking for what this is.

[dnicoara, 2014/07/18 21:48:28]

Done.

+
   gbm_device* gbm_device_;
 
   DriWrapper* dri_;
 
   gfx::Size size_;
 
   // The native GBM surface. In EGL this represents the EGLNativeWindowType.
   gbm_surface* native_surface_;
 
   // Backing GBM buffers. One is the current front buffer. The other is the
   // current backbuffer that is pending scan out.
-  gbm_bo* buffers_[2];
+  scoped_refptr<GbmSurfaceBuffer> buffers_[2];
 
   // Index to the front buffer.
   int front_buffer_;
 
   // We can't lock (and get) an accelerated buffer from the GBM surface until
   // after something draws into it. But modesetting needs to happen earlier,
   // before an actual window is created and draws. So, we create a dumb buffer
   // for this purpose.
   scoped_refptr<DriBuffer> dumb_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurface);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_H_