OLD | NEW |
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/resources/zero_copy_tile_task_worker_pool.h" | 5 #include "cc/resources/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" |
(...skipping 13 matching lines...) Expand all Loading... |
24 : lock_(resource_provider, resource->id()), resource_(resource) {} | 24 : lock_(resource_provider, resource->id()), resource_(resource) {} |
25 | 25 |
26 // Overridden from RasterBuffer: | 26 // Overridden from RasterBuffer: |
27 void Playback(const RasterSource* raster_source, | 27 void Playback(const RasterSource* raster_source, |
28 const gfx::Rect& rect, | 28 const gfx::Rect& rect, |
29 float scale) override { | 29 float scale) override { |
30 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer(); | 30 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer(); |
31 if (!gpu_memory_buffer) | 31 if (!gpu_memory_buffer) |
32 return; | 32 return; |
33 | 33 |
34 TileTaskWorkerPool::PlaybackToMemory( | 34 void* data = NULL; |
35 gpu_memory_buffer->Map(), resource_->format(), resource_->size(), | 35 bool rv = gpu_memory_buffer->Map(&data); |
36 gpu_memory_buffer->GetStride(), raster_source, rect, scale); | 36 DCHECK(rv); |
| 37 uint32 stride; |
| 38 gpu_memory_buffer->GetStride(&stride); |
| 39 TileTaskWorkerPool::PlaybackToMemory(data, resource_->format(), |
| 40 resource_->size(), stride, |
| 41 raster_source, rect, scale); |
37 gpu_memory_buffer->Unmap(); | 42 gpu_memory_buffer->Unmap(); |
38 } | 43 } |
39 | 44 |
40 private: | 45 private: |
41 ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_; | 46 ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_; |
42 const Resource* resource_; | 47 const Resource* resource_; |
43 | 48 |
44 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); | 49 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); |
45 }; | 50 }; |
46 | 51 |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 new base::trace_event::TracedValue(); | 207 new base::trace_event::TracedValue(); |
203 | 208 |
204 state->BeginArray("tasks_pending"); | 209 state->BeginArray("tasks_pending"); |
205 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) | 210 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) |
206 state->AppendBoolean(tasks_pending_[task_set]); | 211 state->AppendBoolean(tasks_pending_[task_set]); |
207 state->EndArray(); | 212 state->EndArray(); |
208 return state; | 213 return state; |
209 } | 214 } |
210 | 215 |
211 } // namespace cc | 216 } // namespace cc |
OLD | NEW |