ozone/platform/wayland: Implement SurfaceOzoneEGL

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/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_display.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"
+#endif
+
 namespace ui {
 
 static void DeleteSharedMemory(void* pixels, void* context) {
   delete static_cast<base::SharedMemory*>(context);
 }
 
 class WaylandCanvasSurface : public SurfaceOzoneCanvas {
  public:
   WaylandCanvasSurface(WaylandDisplay* display, WaylandWindow* window_);
   ~WaylandCanvasSurface() override;
@@ skipping 87 matching lines @@
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 WaylandSurfaceFactory::WaylandSurfaceFactory(WaylandDisplay* display)
     : display_(display) {}
 
 WaylandSurfaceFactory::~WaylandSurfaceFactory() {}
 
 intptr_t WaylandSurfaceFactory::GetNativeDisplay() {
-  NOTIMPLEMENTED();
-  return 0;
+  DCHECK(display_);
+  return reinterpret_cast<intptr_t>(display_->display());
 }
 
 bool WaylandSurfaceFactory::LoadEGLGLES2Bindings(
     AddGLLibraryCallback add_gl_library,
     SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
-  // This Ozone implementation does not support multi-process rendering so
-  // disable EGL unconditionally for now.
+#if defined(USE_WAYLAND_EGL)
+  if (!display_)
+    return false;
+  setenv("EGL_PLATFORM", "wayland", 0);
+  return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
+#else
   return false;
+#endif
 }
 
 scoped_ptr<SurfaceOzoneCanvas> WaylandSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   DCHECK(display_);
   WaylandWindow* window = display_->GetWindow(widget);
   DCHECK(window);
   return make_scoped_ptr(new WaylandCanvasSurface(display_, window));
 }
 
 scoped_ptr<SurfaceOzoneEGL> WaylandSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
-  NOTREACHED();
+#if defined(USE_WAYLAND_EGL)
+  DCHECK(display_);

[spang, 2016/02/24 16:12:11]

It's not useful to DCHECK if you immediately dereference. Just remove the check.

[Michael Forney, 2016/02/24 22:46:41]

Done.

+  WaylandWindow* window = display_->GetWindow(widget);
+  DCHECK(window);
+  auto surface = make_scoped_ptr(
+      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(
     const gfx::NativePixmapHandle& handle) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 }  // namespace ui