Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: cc/raster/zero_copy_tile_task_worker_pool.cc

Issue 1286523002: Add CHECKs when a single GpuMemoryBuffer plane is assumed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@420-biplanar
Patch Set: Forgot #include Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/raster/zero_copy_tile_task_worker_pool.h" 5 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
11 #include "base/trace_event/trace_event_argument.h" 11 #include "base/trace_event/trace_event_argument.h"
12 #include "cc/debug/traced_value.h" 12 #include "cc/debug/traced_value.h"
13 #include "cc/raster/raster_buffer.h" 13 #include "cc/raster/raster_buffer.h"
14 #include "cc/resources/platform_color.h" 14 #include "cc/resources/platform_color.h"
15 #include "cc/resources/resource.h" 15 #include "cc/resources/resource.h"
16 #include "ui/gfx/buffer_format_util.h"
16 #include "ui/gfx/gpu_memory_buffer.h" 17 #include "ui/gfx/gpu_memory_buffer.h"
17 18
18 namespace cc { 19 namespace cc {
19 namespace { 20 namespace {
20 21
21 class RasterBufferImpl : public RasterBuffer { 22 class RasterBufferImpl : public RasterBuffer {
22 public: 23 public:
23 RasterBufferImpl(ResourceProvider* resource_provider, 24 RasterBufferImpl(ResourceProvider* resource_provider,
24 const Resource* resource) 25 const Resource* resource)
25 : lock_(resource_provider, resource->id()), resource_(resource) {} 26 : lock_(resource_provider, resource->id()), resource_(resource) {}
26 27
27 // Overridden from RasterBuffer: 28 // Overridden from RasterBuffer:
28 void Playback(const RasterSource* raster_source, 29 void Playback(const RasterSource* raster_source,
29 const gfx::Rect& raster_full_rect, 30 const gfx::Rect& raster_full_rect,
30 const gfx::Rect& raster_dirty_rect, 31 const gfx::Rect& raster_dirty_rect,
31 uint64_t new_content_id, 32 uint64_t new_content_id,
32 float scale, 33 float scale,
33 bool include_images) override { 34 bool include_images) override {
34 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer(); 35 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer();
35 if (!gpu_memory_buffer) 36 if (!gpu_memory_buffer)
36 return; 37 return;
38 CHECK_EQ(
39 1u, gfx::NumberOfPlanesForBufferFormat(gpu_memory_buffer->GetFormat()));
reveman 2015/08/11 18:59:11 nit: DCHECK_EQ
Andre 2015/08/11 19:37:53 Done.
37 void* data = NULL; 40 void* data = NULL;
38 bool rv = gpu_memory_buffer->Map(&data); 41 bool rv = gpu_memory_buffer->Map(&data);
39 DCHECK(rv); 42 DCHECK(rv);
40 int stride; 43 int stride;
41 gpu_memory_buffer->GetStride(&stride); 44 gpu_memory_buffer->GetStride(&stride);
42 // TileTaskWorkerPool::PlaybackToMemory only supports unsigned strides. 45 // TileTaskWorkerPool::PlaybackToMemory only supports unsigned strides.
43 DCHECK_GE(stride, 0); 46 DCHECK_GE(stride, 0);
44 // TODO(danakj): Implement partial raster with raster_dirty_rect. 47 // TODO(danakj): Implement partial raster with raster_dirty_rect.
45 TileTaskWorkerPool::PlaybackToMemory( 48 TileTaskWorkerPool::PlaybackToMemory(
46 data, resource_->format(), resource_->size(), 49 data, resource_->format(), resource_->size(),
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 new base::trace_event::TracedValue(); 223 new base::trace_event::TracedValue();
221 224
222 state->BeginArray("tasks_pending"); 225 state->BeginArray("tasks_pending");
223 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) 226 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set)
224 state->AppendBoolean(tasks_pending_[task_set]); 227 state->AppendBoolean(tasks_pending_[task_set]);
225 state->EndArray(); 228 state->EndArray();
226 return state; 229 return state;
227 } 230 }
228 231
229 } // namespace cc 232 } // namespace cc
OLDNEW
« cc/raster/one_copy_tile_task_worker_pool.cc ('K') | « cc/raster/one_copy_tile_task_worker_pool.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698