With the overlay path moving back to passing AcceleratedWidgets, move the implementation back into …

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 <gbm.h>
 
 #include "base/files/file_path.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
 #include "ui/ozone/platform/dri/gbm_surfaceless.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
+#include "ui/ozone/public/overlay_candidates_ozone.h"

[dnicoara, 2014/08/07 14:26:04]

Is this needed?

[achaulk, 2014/08/07 14:26:49]

Oh, no that's part of a later patch

 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
 GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
     : DriSurfaceFactory(NULL, NULL),
       device_(NULL),
       allow_surfaceless_(allow_surfaceless) {
 }
 
@@ skipping 90 matching lines @@
     gfx::Size size,
     BufferFormat format) {
   scoped_refptr<GbmBuffer> buffer = GbmBuffer::CreateBuffer(
       drm_, device_, format, size, true);
   if (!buffer)
     return NULL;
 
   return scoped_refptr<GbmPixmap>(new GbmPixmap(buffer));
 }
 
+bool GbmSurfaceFactory::ScheduleOverlayPlane(
+    gfx::AcceleratedWidget w,

[dnicoara, 2014/08/07 14:26:04]

nit: Could you rename this to the longer form: widget. (Same for the other
locations)

[achaulk, 2014/08/07 14:26:49]

Sure

+    int plane_z_order,
+    gfx::OverlayTransform plane_transform,
+    scoped_refptr<NativePixmap> buffer,
+    const gfx::Rect& display_bounds,
+    const gfx::RectF& crop_rect) {
+  scoped_refptr<GbmPixmap> pixmap = static_cast<GbmPixmap*>(buffer.get());
+  if (!pixmap) {
+    LOG(ERROR) << "ScheduleOverlayPlane passed NULL buffer.";
+    return false;
+  }
+  base::WeakPtr<HardwareDisplayController> hdc =
+      screen_manager_->GetDisplayController(w);
+  if (!hdc) {
+    LOG(ERROR) << "Unknown AcceleratedWidget";
+    return false;
+  }
+  hdc->QueueOverlayPlane(OverlayPlane(pixmap->buffer(),
+                                      plane_z_order,
+                                      plane_transform,
+                                      display_bounds,
+                                      crop_rect));
+  return true;
+}
+
 bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
   return allow_surfaceless_;
 }
 
 }  // namespace ui