| Index: cc/raster/one_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| index 73a617291a5104e971204b53d02da2d11f9190ca..6096658a100f4dcf5b0a5b2ad61d55c517117526 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;
|
| }
|
| }
|
|
|