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/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/resource.h" | 14 #include "cc/resources/resource.h" |
15 #include "ui/gfx/gpu_memory_buffer.h" | 15 #include "ui/gfx/gpu_memory_buffer.h" |
16 | 16 |
17 namespace cc { | 17 namespace cc { |
18 namespace { | 18 namespace { |
19 | 19 |
20 class RasterBufferImpl : public RasterBuffer { | 20 class RasterBufferImpl : public RasterBuffer { |
21 public: | 21 public: |
22 RasterBufferImpl(ResourceProvider* resource_provider, | 22 RasterBufferImpl(ResourceProvider* resource_provider, |
23 const Resource* resource) | 23 const Resource* resource) |
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& raster_full_rect, |
| 29 const gfx::Rect& raster_dirty_rect, |
29 float scale) override { | 30 float scale) override { |
30 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer(); | 31 gfx::GpuMemoryBuffer* gpu_memory_buffer = lock_.GetGpuMemoryBuffer(); |
31 if (!gpu_memory_buffer) | 32 if (!gpu_memory_buffer) |
32 return; | 33 return; |
33 | |
34 void* data = NULL; | 34 void* data = NULL; |
35 bool rv = gpu_memory_buffer->Map(&data); | 35 bool rv = gpu_memory_buffer->Map(&data); |
36 DCHECK(rv); | 36 DCHECK(rv); |
37 int stride; | 37 int stride; |
38 gpu_memory_buffer->GetStride(&stride); | 38 gpu_memory_buffer->GetStride(&stride); |
39 TileTaskWorkerPool::PlaybackToMemory(data, resource_->format(), | 39 // TODO(danakj): Implement partial raster with raster_dirty_rect. |
40 resource_->size(), stride, | 40 TileTaskWorkerPool::PlaybackToMemory( |
41 raster_source, rect, scale); | 41 data, resource_->format(), resource_->size(), stride, raster_source, |
| 42 raster_full_rect, raster_full_rect, scale); |
42 gpu_memory_buffer->Unmap(); | 43 gpu_memory_buffer->Unmap(); |
43 } | 44 } |
44 | 45 |
45 private: | 46 private: |
46 ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_; | 47 ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock_; |
47 const Resource* resource_; | 48 const Resource* resource_; |
48 | 49 |
49 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); | 50 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); |
50 }; | 51 }; |
51 | 52 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 task->RunReplyOnOriginThread(); | 170 task->RunReplyOnOriginThread(); |
170 } | 171 } |
171 completed_tasks_.clear(); | 172 completed_tasks_.clear(); |
172 } | 173 } |
173 | 174 |
174 ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat() { | 175 ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat() { |
175 return resource_provider_->best_texture_format(); | 176 return resource_provider_->best_texture_format(); |
176 } | 177 } |
177 | 178 |
178 scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster( | 179 scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster( |
179 const Resource* resource) { | 180 const Resource* resource, |
| 181 uint64_t new_content_id, |
| 182 uint64_t previous_content_id) { |
180 return make_scoped_ptr<RasterBuffer>( | 183 return make_scoped_ptr<RasterBuffer>( |
181 new RasterBufferImpl(resource_provider_, resource)); | 184 new RasterBufferImpl(resource_provider_, resource)); |
182 } | 185 } |
183 | 186 |
184 void ZeroCopyTileTaskWorkerPool::ReleaseBufferForRaster( | 187 void ZeroCopyTileTaskWorkerPool::ReleaseBufferForRaster( |
185 scoped_ptr<RasterBuffer> buffer) { | 188 scoped_ptr<RasterBuffer> buffer) { |
186 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. | 189 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. |
187 } | 190 } |
188 | 191 |
189 void ZeroCopyTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { | 192 void ZeroCopyTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { |
(...skipping 17 matching lines...) Expand all Loading... |
207 new base::trace_event::TracedValue(); | 210 new base::trace_event::TracedValue(); |
208 | 211 |
209 state->BeginArray("tasks_pending"); | 212 state->BeginArray("tasks_pending"); |
210 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) | 213 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) |
211 state->AppendBoolean(tasks_pending_[task_set]); | 214 state->AppendBoolean(tasks_pending_[task_set]); |
212 state->EndArray(); | 215 state->EndArray(); |
213 return state; | 216 return state; |
214 } | 217 } |
215 | 218 |
216 } // namespace cc | 219 } // namespace cc |
OLD | NEW |