GBM Ozone implementation

ui/ozone/platform/dri/dri_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_DRI_SURFACE_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/ozone/ozone_export.h"
+#include "ui/ozone/platform/dri/scanout_surface.h"
 
 class SkCanvas;
 
 namespace ui {
 
 class DriBuffer;
 class DriWrapper;
 
 // DriSurface is used to represent a surface that can be scanned out

[rjkroege, 2014/05/27 15:33:42]

This comment needs to be updated a bit to reflect the ScanoutSurface refactor

[dnicoara, 2014/05/27 17:20:52]

Done.

I've moved the comments and updated them to reflect the current state of the
code.

 // to a monitor. It will store the internal state associated with the drawing
 // surface associated with it. DriSurface also performs all the needed
 // operations to initialize and update the drawing surface.
 //
 // The implementation uses dumb buffers, which is used for software rendering.
 // The intent is to have one DriSurface implementation for a
 // HardwareDisplayController.
 //
 // DoubleBufferedSurface is intended to be the software analog to
 // EGLNativeSurface while DriSurface is intended to provide the glue
@@ skipping 78 matching lines @@
 // |  d  |  |  d  |
 // |     |  |     |
 // |     |  |     |
 // -------  -------
 // b[0]     b[1]*
 //
 // The synchronization consists of copying the damaged area from the frontbuffer
 // to the backbuffer.
 //
 // At this point we're back to step 1 and can start a new draw iteration.
-class OZONE_EXPORT DriSurface {
+class OZONE_EXPORT DriSurface : public ScanoutSurface {
  public:
   DriSurface(DriWrapper* dri, const gfx::Size& size);
   virtual ~DriSurface();
 
-  // Used to allocate all necessary buffers for this surface. If the
-  // initialization succeeds, the device is ready to be used for drawing
-  // operations.
-  // Returns true if the initialization is successful, false otherwise.
-  bool Initialize();
-
-  // Returns the ID of the current backbuffer.
-  uint32_t GetFramebufferId() const;
-
-  // Returns the handle for the current backbuffer.
-  uint32_t GetHandle() const;
-
-  // Synchronizes and swaps the back buffer with the front buffer.
-  void SwapBuffers();
-
   // Get a Skia canvas for a backbuffer.
   SkCanvas* GetDrawableForWidget();
 
-  const gfx::Size& size() const { return size_; }
+  // ScanoutSurface:
+  virtual bool Initialize() OVERRIDE;
+  virtual uint32_t GetFramebufferId() const OVERRIDE;
+  virtual uint32_t GetHandle() const OVERRIDE;
+  virtual void SwapBuffers() OVERRIDE;
+  virtual gfx::Size Size() const OVERRIDE;
 
  private:
   DriBuffer* frontbuffer() const { return bitmaps_[front_buffer_].get(); }
   DriBuffer* backbuffer() const { return bitmaps_[front_buffer_ ^ 1].get(); }
 
   // Used to create the backing buffers.
   virtual DriBuffer* CreateBuffer();
 
   // Stores the connection to the graphics card. Pointer not owned by this
   // class.
   DriWrapper* dri_;
 
   // The actual buffers used for painting.
   scoped_ptr<DriBuffer> bitmaps_[2];
 
   // Keeps track of which bitmap is |buffers_| is the frontbuffer.
   int front_buffer_;
 
   // Surface size.
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(DriSurface);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_DRI_SURFACE_H_