Convert Ozone GBM to use new surface API.

ui/ozone/platform/drm/gpu/gbm_surface_factory.cc

Index: ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
diff --git a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
index 48b203959a2df80f790fb8a1ab3fb594a2942eeb..2b5ae0ec27ed8b15325d492868a83c318c583226 100644
--- a/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc
@@ -6,22 +6,25 @@
 
 #include <gbm.h>
 
+#include <utility>
+
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/gfx/buffer_format_util.h"
+#include "ui/gl/gl_surface_egl.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/drm_thread_proxy.h"
 #include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
-#include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
+#include "ui/ozone/platform/drm/gpu/gl_surface_gbm_buffered_surfaceless.h"
+#include "ui/ozone/platform/drm/gpu/gl_surface_gbm_surfaceless.h"
 #include "ui/ozone/platform/drm/gpu/proxy_helpers.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
-#include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
@@ -33,7 +36,7 @@ GbmSurfaceFactory::~GbmSurfaceFactory() {
 }
 
 void GbmSurfaceFactory::RegisterSurface(gfx::AcceleratedWidget widget,
-                                        GbmSurfaceless* surface) {
+                                        GLSurfaceGbmSurfaceless* surface) {
   DCHECK(thread_checker_.CalledOnValidThread());
   widget_to_surface_map_.insert(std::make_pair(widget, surface));
 }
@@ -43,7 +46,7 @@ void GbmSurfaceFactory::UnregisterSurface(gfx::AcceleratedWidget widget) {
   widget_to_surface_map_.erase(widget);
 }
 
-GbmSurfaceless* GbmSurfaceFactory::GetSurface(
+GLSurfaceGbmSurfaceless* GbmSurfaceFactory::GetSurface(
     gfx::AcceleratedWidget widget) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   auto it = widget_to_surface_map_.find(widget);
@@ -51,6 +54,54 @@ GbmSurfaceless* GbmSurfaceFactory::GetSurface(
   return it->second;
 }
 
+bool GbmSurfaceFactory::UseNewSurfaceAPI() {
+  return true;
+}
+
+scoped_refptr<gl::GLSurface> GbmSurfaceFactory::CreateViewGLSurface(
+    gl::GLImplementation implementation,
+    gfx::AcceleratedWidget widget) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (implementation != gl::kGLImplementationEGLGLES2) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+  return gl::InitializeGLSurface(new GLSurfaceGbmBufferedSurfaceless(
+      drm_thread_->CreateDrmWindowProxy(widget), this, widget));
+}
+
+scoped_refptr<gl::GLSurface> GbmSurfaceFactory::CreateSurfacelessViewGLSurface(
+    gl::GLImplementation implementation,
+    gfx::AcceleratedWidget widget) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (implementation != gl::kGLImplementationEGLGLES2) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+  return gl::InitializeGLSurface(new GLSurfaceGbmSurfaceless(
+      drm_thread_->CreateDrmWindowProxy(widget), this, widget));
+}
+
+scoped_refptr<gl::GLSurface> GbmSurfaceFactory::CreateOffscreenGLSurface(
+    gl::GLImplementation implementation,
+    const gfx::Size& size) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (implementation != gl::kGLImplementationEGLGLES2) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+  DCHECK_EQ(size.width(), 0);
+  DCHECK_EQ(size.height(), 0);
+
+  return gl::InitializeGLSurface(new gl::SurfacelessEGL(size));
+}
+
 intptr_t GbmSurfaceFactory::GetNativeDisplay() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return EGL_DEFAULT_DISPLAY;
@@ -70,20 +121,6 @@ std::unique_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget(
   return nullptr;
 }
 
-std::unique_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
-    gfx::AcceleratedWidget widget) {
-  NOTREACHED();
-  return nullptr;
-}
-
-std::unique_ptr<SurfaceOzoneEGL>
-GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
-    gfx::AcceleratedWidget widget) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  return base::WrapUnique(
-      new GbmSurfaceless(drm_thread_->CreateDrmWindowProxy(widget), this));
-}
-
 std::vector<gfx::BufferFormat> GbmSurfaceFactory::GetScanoutFormats(
     gfx::AcceleratedWidget widget) {
   std::vector<gfx::BufferFormat> scanout_formats;