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

content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.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/client/gpu_memory_buffer_impl_ozone_native_pixmap.h"
 
 #include "ui/ozone/public/client_native_pixmap_factory.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace content {
@@ skipping 11 matching lines @@
 // static
 scoped_ptr<GpuMemoryBufferImpl>
 GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     const DestructionCallback& callback) {
   scoped_ptr<ui::ClientNativePixmap> native_pixmap =
       ui::ClientNativePixmapFactory::GetInstance()->ImportFromHandle(
-          handle.native_pixmap_handle, size, format, usage);
+          handle.native_pixmap_handle, size, usage);
   DCHECK(native_pixmap);
-  return make_scoped_ptr(
-      new GpuMemoryBufferImplOzoneNativePixmap(handle.id, size, format,
-                                               callback, native_pixmap.Pass()));
+  return make_scoped_ptr(new GpuMemoryBufferImplOzoneNativePixmap(
+      handle.id, size, format, callback, native_pixmap.Pass()));
 }
 
 bool GpuMemoryBufferImplOzoneNativePixmap::Map(void** data) {
-  return pixmap_->Map(data);
+  *data = pixmap_->Map();
+  mapped_ = !!(*data);

[reveman, 2015/08/19 13:18:11]

nit: mapped_ = true; and remove the DCHECK below as pixmap_->Map() is not
allowed to return null.

[dshwang, 2015/08/19 13:23:20]

Done.

+  DCHECK(mapped_);
+  return mapped_;
 }
 
 void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
   pixmap_->Unmap();
+  mapped_ = false;
 }
 
 void GpuMemoryBufferImplOzoneNativePixmap::GetStride(int* stride) const {
   pixmap_->GetStride(stride);
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content