exo: Directly create GpuMemoryBufferImpl when a handle is available.

components/exo/display.cc

 // Copyright 2015 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 "components/exo/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/notification_surface.h"
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/sub_surface.h"
 #include "components/exo/surface.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(USE_OZONE)
 #include <GLES2/gl2extchromium.h>
 #include "components/exo/buffer.h"
-#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
+#include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
-#include "ui/aura/env.h"
 #endif
 
+#if defined(USE_OZONE)
+namespace {
+
+void DoNothing(const gpu::SyncToken& sync) {}
+
+}  // namespace
+#endif  // defined(USE_OZONE)
+
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Display, public:
 
 Display::Display() : notification_surface_manager_(nullptr) {}
 
 Display::Display(NotificationSurfaceManager* notification_surface_manager)
     : notification_surface_manager_(notification_surface_manager) {}
 
@@ skipping 26 matching lines @@
                size.ToString());
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   for (auto& fd : fds)
     handle.native_pixmap_handle.fds.emplace_back(std::move(fd));
 
   for (auto& plane : planes)
     handle.native_pixmap_handle.planes.push_back(plane);
 
-  std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
-      aura::Env::GetInstance()
-          ->context_factory()
-          ->GetGpuMemoryBufferManager()
-          ->CreateGpuMemoryBufferFromHandle(handle, size, format);
+  auto gpu_memory_buffer = gpu::GpuMemoryBufferImpl::CreateFromHandle(

[reveman, 2016/12/13 21:30:53]

Can you use gpu::GpuMemoryBufferImplOzoneNativePixmap here instead?

nit: what's the return type now? can you remove auto keep having that be clear?

[sadrul, 2016/12/14 01:41:30]

Done.

+      handle, size, format, gfx::BufferUsage::GPU_READ, base::Bind(&DoNothing));
   if (!gpu_memory_buffer) {
     LOG(ERROR) << "Failed to create GpuMemoryBuffer from handle";
     return nullptr;
   }
 
   // Using zero-copy for optimal performance.
   bool use_zero_copy = true;
 
   // List of overlay formats that are known to be supported.
   // TODO(reveman): Determine this at runtime.
@@ skipping 102 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo