Change NativeBufferOzone to be an object and move the overlay calls to the surface object.

ui/ozone/public/surface_factory_ozone.h

Index: ui/ozone/public/surface_factory_ozone.h
diff --git a/ui/ozone/public/surface_factory_ozone.h b/ui/ozone/public/surface_factory_ozone.h
index 4702d69a59d4e0d0e886b03de92cea7dea007ca6..4c8df027175bf084bff60508655748976add1775 100644
--- a/ui/ozone/public/surface_factory_ozone.h
+++ b/ui/ozone/public/surface_factory_ozone.h
@@ -14,13 +14,13 @@
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/rect.h"
 #include "ui/ozone/ozone_base_export.h"
+#include "ui/ozone/public/native_pixmap.h"

[alexst (slow to review), 2014/07/04 01:31:49]

Can we forward declare this instead?

[spang, 2014/07/04 14:03:15]

probably not

[achaulk, 2014/07/04 15:26:01]

I didn't think so either, but apparently it does work

 
 class SkBitmap;
 class SkCanvas;
 
 namespace ui {
 
-typedef intptr_t NativeBufferOzone;
 class OverlayCandidatesOzone;
 class SurfaceOzoneCanvas;
 class SurfaceOzoneEGL;
@@ -134,25 +134,15 @@ class OZONE_BASE_EXPORT SurfaceFactoryOzone {
   virtual OverlayCandidatesOzone* GetOverlayCandidates(
       gfx::AcceleratedWidget w);
 
-  // Sets the overlay plane to switch to at the next page flip.
-  // |plane_z_order| specifies the stacking order of the plane relative to the
-  // main framebuffer located at index 0.
-  // |plane_transform| specifies how the buffer is to be transformed during.
-  // composition.
-  // |buffer| to be presented by the overlay.
-  // |display_bounds| specify where it is supposed to be on the screen.
-  // |crop_rect| specifies the region within the buffer to be placed inside
-  // |display_bounds|.
-  virtual void ScheduleOverlayPlane(gfx::AcceleratedWidget w,
-                                    int plane_z_order,
-                                    gfx::OverlayTransform plane_transform,
-                                    ui::NativeBufferOzone buffer,
-                                    const gfx::Rect& display_bounds,
-                                    gfx::RectF crop_rect);
-
   // Cleate a single native buffer to be used for overlay planes.
-  virtual ui::NativeBufferOzone CreateNativeBuffer(gfx::Size size,
-                                                   BufferFormat format);
+  virtual scoped_refptr<ui::NativePixmap> CreateNativePixmap(

[alexst (slow to review), 2014/07/04 01:31:49]

nit: We are already in the ui namespace.

+      gfx::Size size,
+      BufferFormat format);
+
+  // Returns true if overlays can be shown at z-index 0, replacing the main
+  // surface. Combined with surfaceless extensions, it allows for an
+  // overlay-only mode.
+  virtual bool CanShowPrimaryPlaneAsOverlay();
 
  private:
   static SurfaceFactoryOzone* impl_;  // not owned