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

content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc

 // Copyright 2013 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_io_surface.h"
 
 #include "base/logging.h"
 #include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h"
 #include "content/common/mac/io_surface_manager.h"
 #include "ui/gfx/buffer_format_util.h"
@@ skipping 71 matching lines @@
   DCHECK(io_surface);
   gfx::GpuMemoryBufferId kBufferId(1);
   bool rv = IOSurfaceManager::GetInstance()->RegisterIOSurface(kBufferId, 0,
                                                                io_surface);
   DCHECK(rv);
   handle->type = gfx::IO_SURFACE_BUFFER;
   handle->id = kBufferId;
   return base::Bind(&FreeIOSurfaceForTesting, kBufferId);
 }
 
-bool GpuMemoryBufferImplIOSurface::Map(void** data) {
+bool GpuMemoryBufferImplIOSurface::Map() {
   DCHECK(!mapped_);
   IOReturn status = IOSurfaceLock(io_surface_, lock_flags_, NULL);
   DCHECK_NE(status, kIOReturnCannotLock);
   mapped_ = true;
-  size_t num_planes = gfx::NumberOfPlanesForBufferFormat(GetFormat());
-  for (size_t plane = 0; plane < num_planes; ++plane)
-    data[plane] = IOSurfaceGetBaseAddressOfPlane(io_surface_, plane);
   return true;
 }
 
+void* GpuMemoryBufferImplIOSurface::memory(size_t plane) {
+  DCHECK(mapped_);
+  DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
+  return IOSurfaceGetBaseAddressOfPlane(io_surface_, plane);
+}
+
 void GpuMemoryBufferImplIOSurface::Unmap() {
   DCHECK(mapped_);
   IOSurfaceUnlock(io_surface_, lock_flags_, NULL);
   mapped_ = false;
 }
 
-void GpuMemoryBufferImplIOSurface::GetStride(int* strides) const {
-  size_t num_planes = gfx::NumberOfPlanesForBufferFormat(GetFormat());
-  for (size_t plane = 0; plane < num_planes; ++plane)
-    strides[plane] = IOSurfaceGetBytesPerRowOfPlane(io_surface_, plane);
+int GpuMemoryBufferImplIOSurface::stride(size_t plane) const {
+  DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
+  return IOSurfaceGetBytesPerRowOfPlane(io_surface_, plane);
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplIOSurface::GetHandle() const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::IO_SURFACE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content