Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc

Issue 1134993003: ozone: Implement zero/one-copy texture for Ozone GBM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve reveman's nits Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 16c8d7f9842d95044f4404cd7a0d161139469d4a..3367568c64b4a2562da074c5fcfeeebeb01a4331 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,7 +29,7 @@ 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<GpuMemoryBufferImpl>(
new GpuMemoryBufferImplOzoneNativePixmap(handle.id, size, format,
@@ -37,11 +37,15 @@ GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
}
bool GpuMemoryBufferImplOzoneNativePixmap::Map(void** data) {
- return pixmap_->Map(data);
+ bool result = pixmap_->Map(data);
+ DCHECK(result);
+ mapped_ = true;
+ return result;
}
void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
pixmap_->Unmap();
+ mapped_ = false;
}
void GpuMemoryBufferImplOzoneNativePixmap::GetStride(int* stride) const {

Powered by Google App Engine
This is Rietveld 408576698