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

cc/raster/one_copy_tile_task_worker_pool.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 "cc/raster/one_copy_tile_task_worker_pool.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/strings/stringprintf.h"
@@ skipping 388 matching lines @@
 
     gfx::Rect playback_rect = raster_full_rect;
     if (use_partial_raster_ && previous_content_id) {
       // Reduce playback rect to dirty region if the content id of the staging
       // buffer matches the prevous content id.
       if (previous_content_id == staging_buffer->content_id)
         playback_rect.Intersect(raster_dirty_rect);
     }
 
     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;
     }
   }
 
   ContextProvider* context_provider =
       resource_provider_->output_surface()->worker_context_provider();
   DCHECK(context_provider);
 
   {
     ContextProvider::ScopedContextLock scoped_context(context_provider);
@@ skipping 377 matching lines @@
 
   staging_state->SetInteger("staging_buffer_count",
                             static_cast<int>(buffers_.size()));
   staging_state->SetInteger("busy_count",
                             static_cast<int>(busy_buffers_.size()));
   staging_state->SetInteger("free_count",
                             static_cast<int>(free_buffers_.size()));
 }
 
 }  // namespace cc