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

cc/raster/zero_copy_tile_task_worker_pool.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 "cc/raster/zero_copy_tile_task_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 14 matching lines @@
                    const Resource* resource)
       : lock_(resource_provider, resource->id()), resource_(resource) {}
 
   // Overridden from RasterBuffer:
   void Playback(const DisplayListRasterSource* raster_source,
                 const gfx::Rect& raster_full_rect,
                 const gfx::Rect& raster_dirty_rect,
                 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:
   ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_;
   const Resource* resource_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 }  // namespace
@@ skipping 166 matching lines @@
       new base::trace_event::TracedValue();
 
   state->BeginArray("tasks_pending");
   for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set)
     state->AppendBoolean(tasks_pending_[task_set]);
   state->EndArray();
   return state;
 }
 
 }  // namespace cc