ozone: Implement zero/one-copy texture for Ozone GBM.

content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.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 "content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
 
 #include "base/logging.h"
 #include "ui/gl/gl_image.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace content {
 namespace {
 
 const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = {
-  { gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT },
-  { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT }
+    {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT},
+    {gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT},
+#if defined(USE_OZONE_GBM)

[reveman, 2015/05/11 16:40:56]

There shouldn't be a USE_OZONE_GBM ifdef here. I think you should remove the
ifdef here and instead filter out MAP formats in
GetSupportedGpuMemoryBufferConfigurations.

[dshwang, 2015/05/14 12:25:46]

Done.

+    {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::MAP}
+#endif
 };
 
 }  // namespace
 
 GpuMemoryBufferFactoryOzoneNativeBuffer::
     GpuMemoryBufferFactoryOzoneNativeBuffer() {
 }
 
 GpuMemoryBufferFactoryOzoneNativeBuffer::
     ~GpuMemoryBufferFactoryOzoneNativeBuffer() {
@@ skipping 24 matching lines @@
 }
 
 gfx::GpuMemoryBufferHandle
 GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
     gfx::GpuMemoryBuffer::Usage usage,
     int client_id,
     gfx::PluginWindowHandle surface_handle) {
-  if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
-          id, size, format, usage, client_id, surface_handle)) {
-    return gfx::GpuMemoryBufferHandle();
-  }
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_BUFFER;
   handle.id = id;
+  if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
+          id, size, format, usage, client_id, surface_handle, &handle)) {
+    return gfx::GpuMemoryBufferHandle();
+  }
   return handle;
 }
 
 void GpuMemoryBufferFactoryOzoneNativeBuffer::DestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id) {
   ozone_native_buffer_factory_.DestroyGpuMemoryBuffer(id, client_id);
 }
 
 gpu::ImageFactory* GpuMemoryBufferFactoryOzoneNativeBuffer::AsImageFactory() {
   return this;
 }
 
 scoped_refptr<gfx::GLImage>
 GpuMemoryBufferFactoryOzoneNativeBuffer::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
     unsigned internalformat,
     int client_id) {
   DCHECK_EQ(handle.type, gfx::OZONE_NATIVE_BUFFER);
   return ozone_native_buffer_factory_.CreateImageForGpuMemoryBuffer(
       handle.id, size, format, internalformat, client_id);
 }
 
 }  // namespace content