Not for review.

ui/gfx/ozone/dri/dri_surface.h

 // Copyright 2013 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_GFX_OZONE_DRI_DRI_SURFACE_H_
 #define UI_GFX_OZONE_DRI_DRI_SURFACE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gfx_export.h"
+#include "ui/gfx/ozone/dri/scanout_surface.h"
 #include "ui/gfx/skia_util.h"
 
 class SkBitmapDevice;
 class SkCanvas;
 
 namespace gfx {
 
 class DriSkBitmap;
 class HardwareDisplayController;
 
-// DriSurface is used to represent a surface that can be scanned out
-// 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
+// SkCanvas backed by DriSkBitmap is intended to be the software analog to
 // EGLNativeSurface while DriSurface is intended to provide the glue
 // necessary to initialize and display the surface to the screen.
 //
 // The typical usage pattern is:
 // -----------------------------------------------------------------------------
 // HardwareDisplayController controller;
 // // Initialize controller
 //
 // DriSurface* surface = new DriSurface(controller);
 // surface.Initialize();
@@ skipping 69 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 GFX_EXPORT DriSurface {
+class GFX_EXPORT DriSurface : public ScanoutSurface {
  public:
   DriSurface(HardwareDisplayController* controller);
 
   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();
+  virtual bool Initialize() OVERRIDE;
 
   // Returns the ID of the current backbuffer.
-  uint32_t GetFramebufferId() const;
+  virtual uint32_t GetFramebufferId() const OVERRIDE;
 
   // Synchronizes and swaps the back buffer with the front buffer.
-  void SwapBuffers();
+  virtual void SwapBuffers() OVERRIDE;
 
   // Get a Skia canvas for a backbuffer.
   SkCanvas* GetDrawableForWidget();
 
  private:
   friend class HardwareDisplayController;
 
   // Used to create the backing buffers.
   virtual DriSkBitmap* CreateBuffer();
 
   // Stores DRM information for this output device (connector, encoder, last
   // CRTC state).
   HardwareDisplayController* controller_;
 
   // The actual buffers used for painting.
   scoped_ptr<DriSkBitmap> bitmaps_[2];
 
   // BitmapDevice for the current backbuffer.
   skia::RefPtr<SkBitmapDevice> skia_device_;
 
   // Canvas for the current backbuffer.
   skia::RefPtr<SkCanvas> skia_canvas_;
 
-  // Keeps track of which bitmap is |buffers_| is the frontbuffer.
+  // Keeps track of which bitmap is |bitmaps_| is the frontbuffer.
   int front_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(DriSurface);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_OZONE_DRI_DRI_SURFACE_H_