Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane)

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h

Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
index 959976fba77e9775aed0b307b1a28d67f7aca87f..b9d55f1be8b07fb1f56912f5d992b6dcaf795e7d 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h
@@ -5,11 +5,11 @@
 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_SURFACE_TEXTURE_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_SURFACE_TEXTURE_H_
 
+#include <android/native_window.h>
+
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
-struct ANativeWindow;
-
 namespace content {
 
 // Implementation of GPU memory buffer based on SurfaceTextures.
@@ -34,10 +34,11 @@ class CONTENT_EXPORT GpuMemoryBufferImplSurfaceTexture
                                           gfx::GpuMemoryBufferHandle* handle);
 
   // Overridden from gfx::GpuMemoryBuffer:
-  bool Map(void** data) override;
+  bool Map() override;
+  void* memory(size_t plane) override;
   void Unmap() override;
+  int stride(size_t plane) const override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
-  void GetStride(int* stride) const override;
 
  private:
   GpuMemoryBufferImplSurfaceTexture(gfx::GpuMemoryBufferId id,
@@ -47,7 +48,7 @@ class CONTENT_EXPORT GpuMemoryBufferImplSurfaceTexture
                                     ANativeWindow* native_window);
 
   ANativeWindow* native_window_;
-  size_t stride_;
+  ANativeWindow_Buffer buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplSurfaceTexture);
 };