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