Not for review.

ui/gfx/ozone/dri/dri_surface_factory.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_FACTORY_H_
 #define UI_GFX_OZONE_DRI_DRI_SURFACE_FACTORY_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 
 namespace gfx {
 
 class DriSurface;
 class DriWrapper;
 class HardwareDisplayController;
+class ScanoutSurface;
 
 // SurfaceFactoryOzone implementation on top of DRM/KMS using dumb buffers.
 // This implementation is used in conjunction with the software rendering
 // path.
 class GFX_EXPORT DriSurfaceFactory : public SurfaceFactoryOzone {
  public:
   DriSurfaceFactory();
   virtual ~DriSurfaceFactory();
 
   virtual HardwareState InitializeHardware() OVERRIDE;
@@ skipping 11 matching lines @@
       gfx::AcceleratedWidget w,
       const gfx::Rect& bounds) OVERRIDE;
 
   virtual bool SchedulePageFlip(gfx::AcceleratedWidget w) OVERRIDE;
 
   virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w) OVERRIDE;
 
   virtual gfx::VSyncProvider* GetVSyncProvider(
       gfx::AcceleratedWidget w) OVERRIDE;
 
+ protected:
+  scoped_ptr<DriWrapper> drm_;
+
+  HardwareState state_;
+
+  // Active output.
+  scoped_ptr<HardwareDisplayController> controller_;
+
  private:
-  virtual DriSurface* CreateSurface(
+  virtual ScanoutSurface* CreateSurface(
     HardwareDisplayController* controller);
 
   virtual DriWrapper* CreateWrapper();
 
+  virtual gfx::AcceleratedWidget GetNativeWidget(ScanoutSurface* surface);
+
   virtual bool InitializeControllerForPrimaryDisplay(
     DriWrapper* drm,
     HardwareDisplayController* controller);
 
   // Blocks until a DRM event is read.
   // TODO(dnicoara) Remove once we can safely move DRM event processing in the
   // message loop while correctly signaling when we're done displaying the
   // pending frame.
   virtual void WaitForPageFlipEvent(int fd);
 
-  scoped_ptr<DriWrapper> drm_;
-
-  HardwareState state_;
-
-  // Active output.
-  scoped_ptr<HardwareDisplayController> controller_;
-
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_OZONE_DRI_DRI_SURFACE_FACTORY_H_