| Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| index 440dbfcec4b9b4ece5f37f28e43442902624c11b..f1c431d142dd37d28054ec50104a731fe15d4b83 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| @@ -68,7 +68,7 @@ GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
|
| handle.id, size, format, callback, native_window));
|
| }
|
|
|
| -void* GpuMemoryBufferImplSurfaceTexture::Map() {
|
| +bool GpuMemoryBufferImplSurfaceTexture::Map(void** data) {
|
| TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
|
|
|
| DCHECK(!mapped_);
|
| @@ -87,7 +87,8 @@ void* GpuMemoryBufferImplSurfaceTexture::Map() {
|
| DCHECK_LE(size_.width(), buffer.stride);
|
| stride_ = stride_in_bytes;
|
| mapped_ = true;
|
| - return buffer.bits;
|
| + *data = buffer.bits;
|
| + return true;
|
| }
|
|
|
| void GpuMemoryBufferImplSurfaceTexture::Unmap() {
|
| @@ -98,8 +99,8 @@ void GpuMemoryBufferImplSurfaceTexture::Unmap() {
|
| mapped_ = false;
|
| }
|
|
|
| -uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
|
| - return stride_;
|
| +void GpuMemoryBufferImplSurfaceTexture::GetStride(uint32* stride) const {
|
| + *stride = stride_;
|
| }
|
|
|
| gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
|
|
|