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/raster/bitmap_tile_task_worker_pool.h" | 5 #include "cc/raster/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/playback/raster_source.h" | 13 #include "cc/playback/raster_source.h" |
14 #include "cc/raster/raster_buffer.h" | 14 #include "cc/raster/raster_buffer.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& raster_full_rect, |
| 29 const gfx::Rect& raster_dirty_rect, |
29 float scale) override { | 30 float scale) override { |
30 TileTaskWorkerPool::PlaybackToMemory(lock_.sk_bitmap().getPixels(), | 31 // TODO(danakj): Implement partial raster using raster_dirty_rect. |
31 resource_->format(), resource_->size(), | 32 TileTaskWorkerPool::PlaybackToMemory( |
32 0, raster_source, rect, scale); | 33 lock_.sk_bitmap().getPixels(), resource_->format(), resource_->size(), |
| 34 0, raster_source, raster_full_rect, raster_full_rect, scale); |
33 } | 35 } |
34 | 36 |
35 private: | 37 private: |
36 ResourceProvider::ScopedWriteLockSoftware lock_; | 38 ResourceProvider::ScopedWriteLockSoftware lock_; |
37 const Resource* resource_; | 39 const Resource* resource_; |
38 | 40 |
39 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); | 41 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); |
40 }; | 42 }; |
41 | 43 |
42 } // namespace | 44 } // namespace |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 task->RunReplyOnOriginThread(); | 161 task->RunReplyOnOriginThread(); |
160 } | 162 } |
161 completed_tasks_.clear(); | 163 completed_tasks_.clear(); |
162 } | 164 } |
163 | 165 |
164 ResourceFormat BitmapTileTaskWorkerPool::GetResourceFormat() { | 166 ResourceFormat BitmapTileTaskWorkerPool::GetResourceFormat() { |
165 return resource_provider_->best_texture_format(); | 167 return resource_provider_->best_texture_format(); |
166 } | 168 } |
167 | 169 |
168 scoped_ptr<RasterBuffer> BitmapTileTaskWorkerPool::AcquireBufferForRaster( | 170 scoped_ptr<RasterBuffer> BitmapTileTaskWorkerPool::AcquireBufferForRaster( |
169 const Resource* resource) { | 171 const Resource* resource, |
| 172 uint64_t new_content_id, |
| 173 uint64_t previous_content_id) { |
170 return make_scoped_ptr<RasterBuffer>( | 174 return make_scoped_ptr<RasterBuffer>( |
171 new RasterBufferImpl(resource_provider_, resource)); | 175 new RasterBufferImpl(resource_provider_, resource)); |
172 } | 176 } |
173 | 177 |
174 void BitmapTileTaskWorkerPool::ReleaseBufferForRaster( | 178 void BitmapTileTaskWorkerPool::ReleaseBufferForRaster( |
175 scoped_ptr<RasterBuffer> buffer) { | 179 scoped_ptr<RasterBuffer> buffer) { |
176 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. | 180 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. |
177 } | 181 } |
178 | 182 |
179 void BitmapTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { | 183 void BitmapTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { |
(...skipping 17 matching lines...) Expand all Loading... |
197 new base::trace_event::TracedValue(); | 201 new base::trace_event::TracedValue(); |
198 | 202 |
199 state->BeginArray("tasks_pending"); | 203 state->BeginArray("tasks_pending"); |
200 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) | 204 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) |
201 state->AppendBoolean(tasks_pending_[task_set]); | 205 state->AppendBoolean(tasks_pending_[task_set]); |
202 state->EndArray(); | 206 state->EndArray(); |
203 return state; | 207 return state; |
204 } | 208 } |
205 | 209 |
206 } // namespace cc | 210 } // namespace cc |
OLD | NEW |