Not for review.

ui/gfx/ozone/dri/dri_surface.h

Index: ui/gfx/ozone/dri/dri_surface.h
diff --git a/ui/gfx/ozone/dri/dri_surface.h b/ui/gfx/ozone/dri/dri_surface.h
index 53258cf8086fe0e499dce61be2f351fa0884c933..de59a2d6a52b702d59cbc571071a17ffe7f06657 100644
--- a/ui/gfx/ozone/dri/dri_surface.h
+++ b/ui/gfx/ozone/dri/dri_surface.h
@@ -8,6 +8,7 @@
 #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;
@@ -18,16 +19,11 @@ 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.
 //
@@ -117,7 +113,7 @@ class HardwareDisplayController;
 // 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);
 
@@ -127,13 +123,13 @@ class GFX_EXPORT DriSurface {
   // 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();
@@ -157,7 +153,7 @@ class GFX_EXPORT DriSurface {
   // 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);