| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/bitmap_tile_task_worker_pool.h" | 5 #include "cc/resources/bitmap_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/resources/raster_buffer.h" | 13 #include "cc/resources/raster_buffer.h" |
| 14 #include "cc/resources/raster_source.h" | 14 #include "cc/resources/raster_source.h" |
| 15 #include "cc/resources/resource.h" | 15 #include "cc/resources/resource.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 TileTaskWorkerPool::PlaybackToMemory(lock_.sk_bitmap().getPixels(), | 30 TileTaskWorkerPool::PlaybackToMemory( |
| 31 resource_->format(), resource_->size(), | 31 lock_.sk_bitmap().getPixels(), resource_->format(), resource_->size(), |
| 32 0, raster_source, rect, scale); | 32 0, raster_source, rect, gfx::Vector2d(), scale, |
| 33 false /* partial_update */); |
| 33 } | 34 } |
| 34 | 35 |
| 35 private: | 36 private: |
| 36 ResourceProvider::ScopedWriteLockSoftware lock_; | 37 ResourceProvider::ScopedWriteLockSoftware lock_; |
| 37 const Resource* resource_; | 38 const Resource* resource_; |
| 38 | 39 |
| 39 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); | 40 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); |
| 40 }; | 41 }; |
| 41 | 42 |
| 42 } // namespace | 43 } // namespace |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 task->RunReplyOnOriginThread(); | 160 task->RunReplyOnOriginThread(); |
| 160 } | 161 } |
| 161 completed_tasks_.clear(); | 162 completed_tasks_.clear(); |
| 162 } | 163 } |
| 163 | 164 |
| 164 ResourceFormat BitmapTileTaskWorkerPool::GetResourceFormat() { | 165 ResourceFormat BitmapTileTaskWorkerPool::GetResourceFormat() { |
| 165 return resource_provider_->best_texture_format(); | 166 return resource_provider_->best_texture_format(); |
| 166 } | 167 } |
| 167 | 168 |
| 168 scoped_ptr<RasterBuffer> BitmapTileTaskWorkerPool::AcquireBufferForRaster( | 169 scoped_ptr<RasterBuffer> BitmapTileTaskWorkerPool::AcquireBufferForRaster( |
| 169 const Resource* resource) { | 170 const TileTaskData& data) { |
| 170 return make_scoped_ptr<RasterBuffer>( | 171 return make_scoped_ptr<RasterBuffer>( |
| 171 new RasterBufferImpl(resource_provider_, resource)); | 172 new RasterBufferImpl(resource_provider_, data.resource)); |
| 172 } | 173 } |
| 173 | 174 |
| 174 void BitmapTileTaskWorkerPool::ReleaseBufferForRaster( | 175 void BitmapTileTaskWorkerPool::ReleaseBufferForRaster( |
| 175 scoped_ptr<RasterBuffer> buffer) { | 176 scoped_ptr<RasterBuffer> buffer) { |
| 176 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. | 177 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. |
| 177 } | 178 } |
| 178 | 179 |
| 179 void BitmapTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { | 180 void BitmapTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { |
| 180 TRACE_EVENT1("cc", "BitmapTileTaskWorkerPool::OnTaskSetFinished", "task_set", | 181 TRACE_EVENT1("cc", "BitmapTileTaskWorkerPool::OnTaskSetFinished", "task_set", |
| 181 task_set); | 182 task_set); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 197 new base::trace_event::TracedValue(); | 198 new base::trace_event::TracedValue(); |
| 198 | 199 |
| 199 state->BeginArray("tasks_pending"); | 200 state->BeginArray("tasks_pending"); |
| 200 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) | 201 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) |
| 201 state->AppendBoolean(tasks_pending_[task_set]); | 202 state->AppendBoolean(tasks_pending_[task_set]); |
| 202 state->EndArray(); | 203 state->EndArray(); |
| 203 return state; | 204 return state; |
| 204 } | 205 } |
| 205 | 206 |
| 206 } // namespace cc | 207 } // namespace cc |
| OLD | NEW |