Add multi-planar functions to GpuMemoryBuffer

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.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_surface_texture.h"
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 50 matching lines @@
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   ANativeWindow_setBuffersGeometry(
       native_window, size.width(), size.height(), WindowFormat(format));
 
   return make_scoped_ptr<GpuMemoryBufferImpl>(
       new GpuMemoryBufferImplSurfaceTexture(
           handle.id, size, format, callback, native_window));
 }
 
-void* GpuMemoryBufferImplSurfaceTexture::Map() {
+bool GpuMemoryBufferImplSurfaceTexture::Map(void** data) {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
 
   DCHECK(!mapped_);
+  DCHECK_EQ(num_planes_, 1u);

[reveman, 2015/03/24 20:13:59]

Not needed as it would require us to create a buffer of an unsupported format.
We have other checks preventing that from happening.

[emircan, 2015/03/24 21:43:44]

Done.

   DCHECK(native_window_);
   ANativeWindow_Buffer buffer;
   int status = ANativeWindow_lock(native_window_, &buffer, NULL);
   if (status) {
     VLOG(1) << "ANativeWindow_lock failed with error code: " << status;
     return NULL;
   }
 
   size_t stride_in_bytes = 0;
   if (!StrideInBytes(buffer.stride, format_, &stride_in_bytes))
     return NULL;
 
   DCHECK_LE(size_.width(), buffer.stride);
   stride_ = stride_in_bytes;
   mapped_ = true;
-  return buffer.bits;
+  data[0] = buffer.bits;
+  return true;
 }
 
 void GpuMemoryBufferImplSurfaceTexture::Unmap() {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Unmap");
 
   DCHECK(mapped_);
   ANativeWindow_unlockAndPost(native_window_);
   mapped_ = false;
 }
 
-uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
-  return stride_;
+bool GpuMemoryBufferImplSurfaceTexture::GetStride(uint32* stride) const {
+  DCHECK_EQ(num_planes_, 1u);

[reveman, 2015/03/24 20:13:59]

Not needed as it would require us to create a buffer of an unsupported format.
We have other checks preventing that from happening.

[emircan, 2015/03/24 21:43:44]

Done.

+  stride[0] = stride_;
+  return true;
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content