GpuMemoryBuffer interface change: Map(**) --> Map() + memory(plane); GetStride(*) --> stride(plane)

And at the same time clean up/simplify/homogeneise
uses of those APIs.

buffer_format_util.cc:RowSizeForBufferFormatChecked()
is only used in unittests and internally to the file, this CL
restricts it to the .cc file. Also a function there is only
used in test --> added ForTesting() suffix.

BUG=542225
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1401183003

Cr-Commit-Position: refs/heads/master@{#355396}

2 files changed, 21 insertions, 22 deletions

diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index 73a6172..6096658 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -406,21 +406,21 @@ void OneCopyTileTaskWorkerPool::PlaybackAndCopyOnWorkerThread(
     }
 
     if (staging_buffer->gpu_memory_buffer) {
-      void* data = nullptr;
-      bool rv = staging_buffer->gpu_memory_buffer->Map(&data);
+      gfx::GpuMemoryBuffer* buffer = staging_buffer->gpu_memory_buffer.get();
+      DCHECK_EQ(1u, gfx::NumberOfPlanesForBufferFormat(buffer->GetFormat()));
+      bool rv = buffer->Map();
       DCHECK(rv);
-      int stride;
-      staging_buffer->gpu_memory_buffer->GetStride(&stride);
+      DCHECK(buffer->memory(0));
       // TileTaskWorkerPool::PlaybackToMemory only supports unsigned strides.
-      DCHECK_GE(stride, 0);
+      DCHECK_GE(buffer->stride(0), 0);
 
       DCHECK(!playback_rect.IsEmpty())
           << "Why are we rastering a tile that's not dirty?";
       TileTaskWorkerPool::PlaybackToMemory(
-          data, resource->format(), staging_buffer->size,
-          static_cast<size_t>(stride), raster_source, raster_full_rect,
-          playback_rect, scale, include_images);
-      staging_buffer->gpu_memory_buffer->Unmap();
+          buffer->memory(0), resource->format(), staging_buffer->size,
+          buffer->stride(0), raster_source, raster_full_rect, playback_rect,
+          scale, include_images);
+      buffer->Unmap();
       staging_buffer->content_id = new_content_id;
     }
   }
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
index 8a92e63a..147eeca 100644
--- a/cc/raster/zero_copy_tile_task_worker_pool.cc
+++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
@@ -32,24 +32,23 @@ class RasterBufferImpl : public RasterBuffer {
                 uint64_t new_content_id,
                 float scale,
                 bool include_images) override {
-    gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer();
-    if (!gpu_memory_buffer)
+    gfx::GpuMemoryBuffer* buffer = lock_.GetGpuMemoryBuffer();
+    if (!buffer)
       return;
-    DCHECK_EQ(
-        1u, gfx::NumberOfPlanesForBufferFormat(gpu_memory_buffer->GetFormat()));
-    void* data = NULL;
-    bool rv = gpu_memory_buffer->Map(&data);
+
+    DCHECK_EQ(1u, gfx::NumberOfPlanesForBufferFormat(buffer->GetFormat()));
+    bool rv = buffer->Map();
     DCHECK(rv);
-    int stride;
-    gpu_memory_buffer->GetStride(&stride);
+    DCHECK(buffer->memory(0));
     // TileTaskWorkerPool::PlaybackToMemory only supports unsigned strides.
-    DCHECK_GE(stride, 0);
+    DCHECK_GE(buffer->stride(0), 0);
+
     // TODO(danakj): Implement partial raster with raster_dirty_rect.
     TileTaskWorkerPool::PlaybackToMemory(
-        data, resource_->format(), resource_->size(),
-        static_cast<size_t>(stride), raster_source, raster_full_rect,
-        raster_full_rect, scale, include_images);
-    gpu_memory_buffer->Unmap();
+        buffer->memory(0), resource_->format(), resource_->size(),
+        buffer->stride(0), raster_source, raster_full_rect, raster_full_rect,
+        scale, include_images);
+    buffer->Unmap();
   }
 
  private: