ozone: Add OzoneSurface object that is owned by compositor, GLSurface

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"
+#include "ui/gfx/ozone/surface_ozone.h"
 
 namespace gfx {
 
 class DriSurface;
 class DriWrapper;
 class HardwareDisplayController;
+class SurfaceOzone;
 
 // 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;
   virtual void ShutdownHardware() OVERRIDE;
 
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
-  virtual gfx::AcceleratedWidget RealizeAcceleratedWidget(
+
+  virtual scoped_ptr<SurfaceOzone> CreateSurfaceForWidget(
       gfx::AcceleratedWidget w) OVERRIDE;
 
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
 
-  virtual bool AttemptToResizeAcceleratedWidget(
-      gfx::AcceleratedWidget w,
-      const gfx::Rect& bounds) OVERRIDE;
+  virtual bool SchedulePageFlip(gfx::AcceleratedWidget w);
 
-  virtual bool SchedulePageFlip(gfx::AcceleratedWidget w) OVERRIDE;
-
-  virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w) OVERRIDE;
+  virtual SkCanvas* GetCanvasForWidget(gfx::AcceleratedWidget w);
 
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider(
-      gfx::AcceleratedWidget w) OVERRIDE;
+      gfx::AcceleratedWidget w);
 
   void SetHardwareCursor(AcceleratedWidget window,
                          const SkBitmap& image,
                          const gfx::Point& location);
 
   void MoveHardwareCursor(AcceleratedWidget window, const gfx::Point& location);
 
   void UnsetHardwareCursor(AcceleratedWidget window);
 
  private:
@@ skipping 19 matching lines @@
   scoped_ptr<HardwareDisplayController> controller_;
 
   scoped_ptr<DriSurface> cursor_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_OZONE_DRI_DRI_SURFACE_FACTORY_H_