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

gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.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 <GLES2/gl2.h>
 #include <GLES2/gl2chromium.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/bind.h"
@@ skipping 152 matching lines @@
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
   // Create the gpu memory buffer.
   scoped_ptr<gfx::GpuMemoryBuffer> buffer(gl_.CreateGpuMemoryBuffer(
       gfx::Size(kImageWidth, kImageHeight), GetParam()));
 
   // Map buffer for writing.
-  void* data;
-  bool rv = buffer->Map(&data);
-  DCHECK(rv);
-
-  uint8_t* mapped_buffer = static_cast<uint8_t*>(data);
-  ASSERT_TRUE(mapped_buffer != NULL);
-
+  ASSERT_TRUE(buffer->Map());
+  ASSERT_NE(nullptr, buffer->memory(0));
+  ASSERT_NE(0, buffer->stride(0));
   uint8_t pixel[] = {255u, 0u, 0u, 255u};
 
   // Assign a value to each pixel.
-  int stride = 0;
-  buffer->GetStride(&stride);
-  ASSERT_NE(stride, 0);
-  for (int y = 0; y < kImageHeight; ++y)
-    SetRow(GetParam(), mapped_buffer + y * stride, kImageWidth, pixel);
-
+  for (int y = 0; y < kImageHeight; ++y) {
+    SetRow(GetParam(),
+           static_cast<uint8_t*>(buffer->memory(0)) + y * buffer->stride(0),
+           kImageWidth, pixel);
+  }
   // Unmap the buffer.
   buffer->Unmap();
 
   // Create the image. This should add the image ID to the ImageManager.
   GLuint image_id =
       glCreateImageCHROMIUM(buffer->AsClientBuffer(), kImageWidth, kImageHeight,
                             InternalFormat(GetParam()));
   ASSERT_NE(0u, image_id);
   ASSERT_TRUE(gl_.decoder()->GetImageManager()->LookupImage(image_id) != NULL);
 
@@ skipping 38 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(GpuMemoryBufferTests,
                         GpuMemoryBufferTest,
                         ::testing::Values(gfx::BufferFormat::R_8,
                                           gfx::BufferFormat::RGBA_4444,
                                           gfx::BufferFormat::RGBA_8888,
                                           gfx::BufferFormat::BGRA_8888));
 
 }  // namespace gles2
 }  // namespace gpu