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

ui/ozone/public/surface_factory_ozone.h

 // Copyright (c) 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_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_
 #define UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_
 
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/rect.h"
 #include "ui/ozone/ozone_base_export.h"
 
 class SkBitmap;
 class SkCanvas;
 
 namespace ui {
 
-typedef intptr_t NativeBufferOzone;
 class OverlayCandidatesOzone;
 class SurfaceOzoneCanvas;
 class SurfaceOzoneEGL;
 
+// TODO: find a better spot for this to live.
+class NativePixmap : public base::RefCounted<NativePixmap> {

[dnicoara, 2014/07/03 18:30:17]

Just move it in it's own file.

And add some comments describing what this is and how it is used.

+ public:
+  NativePixmap() {}
+
+  virtual void* /* EGLClientBuffer */ native_handle() = 0;

[spang, 2014/07/03 18:29:09]

If this is "get me the handle to pass to EGL" then I still think it should say
so. So egl_client_buffer or GetEGLClientBuffer().

[dnicoara, 2014/07/03 18:30:17]

I believe these should follow the normal naming convention: NativeHandle()

[achaulk, 2014/07/03 19:49:43]

Done.

+  virtual int dma_buf_fd() = 0;
+
+ protected:
+  virtual ~NativePixmap() {}
+
+  friend class base::RefCounted<NativePixmap>;
+
+  DISALLOW_COPY_AND_ASSIGN(NativePixmap);
+};
+
 // The Ozone interface allows external implementations to hook into Chromium to
 // provide a system specific implementation. The Ozone interface supports two
 // drawing modes: 1) accelerated drawing through EGL and 2) software drawing
 // through Skia.
 //
 // If you want to paint on a window with ozone, you need to create a
 // SurfaceOzoneEGL or SurfaceOzoneCanvas for that window. The platform can
 // support software, EGL, or both for painting on the window.
 // The following functionality is specific to the drawing mode and may not have
 // any meaningful implementation in the other mode. An implementation must
@@ skipping 89 matching lines @@
   // used to select a display configuration. Note that all properties should be
   // immediately followed by the corresponding desired value and array should be
   // terminated with EGL_NONE. Ownership of the array is not transferred to
   // caller. desired_list contains list of desired EGL properties and values.
   virtual const int32* GetEGLSurfaceProperties(const int32* desired_list);
 
   // Get the hal struct to check for overlay support.
   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 scoped_refptr<ui::NativePixmap> CreateNativeBuffer(
+      gfx::Size size, BufferFormat format);

[spang, 2014/07/03 18:29:09]

seems rather inconsistent. CreateNativePixmap

[achaulk, 2014/07/03 19:49:44]

Done.

 
-  // Cleate a single native buffer to be used for overlay planes.
-  virtual ui::NativeBufferOzone CreateNativeBuffer(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();

[spang, 2014/07/03 18:29:09]

thanks

 
  private:
   static SurfaceFactoryOzone* impl_;  // not owned
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PUBLIC_SURFACE_FACTORY_OZONE_H_