| Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| index e7ebdcff57c14d1fabe62f9c697b0c52cecb499c..afeeb2ca4747066483effec62b104d74c99a8868 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| @@ -29,19 +29,21 @@ GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
|
| 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_ = true;
|
| + return mapped_;
|
| }
|
|
|
| void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
|
| pixmap_->Unmap();
|
| + mapped_ = false;
|
| }
|
|
|
| void GpuMemoryBufferImplOzoneNativePixmap::GetStride(int* stride) const {
|
|
|