Convert Ozone wayland to directly create GLSurfaces.

ui/ozone/platform/wayland/wayland_surface_factory.cc

 // Copyright 2016 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/wayland/wayland_surface_factory.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <wayland-client.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/platform/wayland/wayland_connection.h"
 #include "ui/ozone/platform/wayland/wayland_object.h"
 #include "ui/ozone/platform/wayland/wayland_window.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 #if defined(USE_WAYLAND_EGL)
-#include "ui/ozone/platform/wayland/wayland_egl_surface.h"
+#include "ui/ozone/platform/wayland/gl_surface_wayland.h"
 #endif
 
 namespace ui {
 
 static void DeleteSharedMemory(void* pixels, void* context) {
   delete static_cast<base::SharedMemory*>(context);
 }
 
 class WaylandCanvasSurface : public SurfaceOzoneCanvas {
  public:
@@ skipping 91 matching lines @@
   // callbacks, and possibly output refresh rate.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 WaylandSurfaceFactory::WaylandSurfaceFactory(WaylandConnection* connection)
     : connection_(connection) {}
 
 WaylandSurfaceFactory::~WaylandSurfaceFactory() {}
 
+scoped_refptr<gl::GLSurface> WaylandSurfaceFactory::CreateViewGLSurface(
+    gl::GLImplementation implementation,
+    gfx::AcceleratedWidget widget) {
+  if (implementation != gl::kGLImplementationEGLGLES2) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+#if defined(USE_WAYLAND_EGL)
+  WaylandWindow* window = connection_->GetWindow(widget);
+  DCHECK(window);
+  // The wl_egl_window needs to be created before the GLSurface so it can be
+  // used in the GLSurface constructor.
+  auto egl_window = CreateWaylandEglWindow(window);
+  if (!egl_window)
+    return nullptr;
+  return gl::InitializeGLSurface(new GLSurfaceWayland(std::move(egl_window)));
+#else
+  return nullptr;
+#endif
+}
+
+scoped_refptr<gl::GLSurface> WaylandSurfaceFactory::CreateOffscreenGLSurface(
+    gl::GLImplementation implementation,
+    const gfx::Size& size) {
+  if (implementation != gl::kGLImplementationEGLGLES2) {
+    NOTREACHED();
+    return nullptr;
+  }
+
+#if defined(USE_WAYLAND_EGL)
+  return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
+#else
+  return nullptr;
+#endif
+}
+
 intptr_t WaylandSurfaceFactory::GetNativeDisplay() {
   return reinterpret_cast<intptr_t>(connection_->display());
 }
 
 bool WaylandSurfaceFactory::LoadEGLGLES2Bindings(
     AddGLLibraryCallback add_gl_library,
     SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
 #if defined(USE_WAYLAND_EGL)
   if (!connection_)
     return false;
   setenv("EGL_PLATFORM", "wayland", 0);
   return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
 #else
   return false;
 #endif
 }
 
 std::unique_ptr<SurfaceOzoneCanvas>
 WaylandSurfaceFactory::CreateCanvasForWidget(gfx::AcceleratedWidget widget) {
   WaylandWindow* window = connection_->GetWindow(widget);
   DCHECK(window);
   return base::WrapUnique(new WaylandCanvasSurface(connection_, window));
 }
 
-std::unique_ptr<SurfaceOzoneEGL>
-WaylandSurfaceFactory::CreateEGLSurfaceForWidget(
-    gfx::AcceleratedWidget widget) {
-#if defined(USE_WAYLAND_EGL)
-  WaylandWindow* window = connection_->GetWindow(widget);
-  DCHECK(window);
-  auto surface = base::WrapUnique(
-      new WaylandEGLSurface(window, window->GetBounds().size()));
-  if (!surface->Initialize())
-    return nullptr;
-  return std::move(surface);
-#else
-  return nullptr;
-#endif
-}
-
 scoped_refptr<NativePixmap> WaylandSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 scoped_refptr<NativePixmap> WaylandSurfaceFactory::CreateNativePixmapFromHandle(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     gfx::BufferFormat format,
     const gfx::NativePixmapHandle& handle) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 }  // namespace ui