ozone: gbm: Add overlay support

ui/ozone/platform/dri/gbm_surface_factory.cc

 // Copyright 2014 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.
 
 #include "ui/ozone/platform/dri/gbm_surface_factory.h"
 
 #include <EGL/egl.h>
 #include <gbm.h>
 
 #include "base/files/file_path.h"
 #include "ui/ozone/platform/dri/buffer_data.h"
 #include "ui/ozone/platform/dri/dri_vsync_provider.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_surface.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
+#include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
 namespace {
 
 class GbmSurfaceAdapter : public ui::SurfaceOzoneEGL {
  public:
   GbmSurfaceAdapter(const base::WeakPtr<HardwareDisplayController>& controller);
   virtual ~GbmSurfaceAdapter();
 
   // SurfaceOzoneEGL:
   virtual intptr_t GetNativeWindow() OVERRIDE;
   virtual bool ResizeNativeWindow(const gfx::Size& viewport_size) OVERRIDE;
   virtual bool OnSwapBuffers() OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
   virtual bool ScheduleOverlayPlane(int plane_z_order,
                                     gfx::OverlayTransform plane_transform,
                                     scoped_refptr<ui::NativePixmap> buffer,
                                     const gfx::Rect& display_bounds,
                                     const gfx::RectF& crop_rect) OVERRIDE;
 
  private:
   base::WeakPtr<HardwareDisplayController> controller_;
+  std::vector<scoped_refptr<NativePixmap> > overlay_refs_;

[alexst (slow to review), 2014/07/08 17:22:32]

nit: these vector declarations are re-used in a bunch of places, can you typedef
them to NativePixmapList, etc? This is a pattern used in a lot of place in
chromium code and I'd like to carry it over.

[achaulk, 2014/07/08 18:16:37]

Sure

+  std::vector<OzoneOverlayPlane> overlays_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceAdapter);
 };
 
 GbmSurfaceAdapter::GbmSurfaceAdapter(
     const base::WeakPtr<HardwareDisplayController>& controller)
     : controller_(controller) {}
 
 GbmSurfaceAdapter::~GbmSurfaceAdapter() {}
 
 intptr_t GbmSurfaceAdapter::GetNativeWindow() {
   if (!controller_)
     return 0;
 
   return reinterpret_cast<intptr_t>(
       static_cast<GbmSurface*>(controller_->surface())->native_surface());
 }
 
 bool GbmSurfaceAdapter::ResizeNativeWindow(const gfx::Size& viewport_size) {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool GbmSurfaceAdapter::OnSwapBuffers() {
   if (!controller_)
     return false;
+  bool ret = controller_->SchedulePageFlip(&overlays_, &overlay_refs_);

[alexst (slow to review), 2014/07/08 17:22:32]

this is hard to read without context, please rename to flip_succeeded

[achaulk, 2014/07/08 18:16:37]

Done.

+  overlays_.clear();
 
-  static_cast<GbmSurface*>(controller_->surface())->LockCurrentDrawable();
-  if (controller_->SchedulePageFlip()) {
+  if (ret)
     controller_->WaitForPageFlipEvent();
-    return true;
-  }
 
-  return false;
+  return ret;
 }
 
 bool GbmSurfaceAdapter::ScheduleOverlayPlane(
     int plane_z_order,
     gfx::OverlayTransform plane_transform,
-    scoped_refptr<ui::NativePixmap> buffer,
+    scoped_refptr<NativePixmap> buffer,
     const gfx::Rect& display_bounds,
     const gfx::RectF& crop_rect) {
-  NOTIMPLEMENTED();
-  return false;
+  GbmBuffer* gbm_buffer = static_cast<GbmBuffer*>(buffer.get());
+  if (!gbm_buffer) {
+    LOG(ERROR) << "ScheduleOverlayPlane passed NULL buffer";
+    return false;
+  }
+  overlays_.push_back(OzoneOverlayPlane(
+      gbm_buffer, plane_z_order, plane_transform, display_bounds, crop_rect));
+  overlay_refs_.push_back(buffer);
+  return true;
 }
 
 scoped_ptr<gfx::VSyncProvider> GbmSurfaceAdapter::CreateVSyncProvider() {
   return scoped_ptr<gfx::VSyncProvider>(new DriVSyncProvider(controller_));
 }
 
 }  // namespace
 
-GbmSurfaceFactory::GbmSurfaceFactory()
+GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
     : DriSurfaceFactory(NULL, NULL),
-      device_(NULL) {}
+      device_(NULL),
+      allow_surfaceless_(allow_surfaceless) {
+}
 
 GbmSurfaceFactory::~GbmSurfaceFactory() {}
 
 void GbmSurfaceFactory::InitializeGpu(
     DriWrapper* dri, gbm_device* device, ScreenManager* screen_manager) {
   drm_ = dri;
   device_ = device;
   screen_manager_ = screen_manager;
 }
 
@@ skipping 69 matching lines @@
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::Size size,
     BufferFormat format) {
   scoped_refptr<GbmBuffer> buf = new GbmBuffer(device_, drm_, size);
   if (!buf->InitializeBuffer(format, true)) {
     return NULL;
   }
   return buf;
 }
 
+bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
+  return allow_surfaceless_;
+}
+
 }  // namespace ui