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/image_raster_worker_pool.h" | 5 #include "cc/resources/image_raster_worker_pool.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "cc/debug/traced_value.h" | 9 #include "cc/debug/traced_value.h" |
10 #include "cc/resources/resource.h" | 10 #include "cc/resources/resource.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 stride_(stride), | 27 stride_(stride), |
28 reply_(reply) { | 28 reply_(reply) { |
29 } | 29 } |
30 | 30 |
31 // Overridden from internal::WorkerPoolTask: | 31 // Overridden from internal::WorkerPoolTask: |
32 virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE { | 32 virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE { |
33 TRACE_EVENT0("cc", "ImageWorkerPoolTaskImpl::RunOnWorkerThread"); | 33 TRACE_EVENT0("cc", "ImageWorkerPoolTaskImpl::RunOnWorkerThread"); |
34 if (!buffer_) | 34 if (!buffer_) |
35 return; | 35 return; |
36 | 36 |
37 SkBitmap bitmap; | 37 task_->RunOnWorkerThread(thread_index, |
38 bitmap.setConfig(SkBitmap::kARGB_8888_Config, | 38 buffer_, |
39 task_->resource()->size().width(), | 39 task_->resource()->size(), |
40 task_->resource()->size().height(), | 40 stride_); |
41 stride_); | |
42 bitmap.setPixels(buffer_); | |
43 SkBitmapDevice device(bitmap); | |
44 task_->RunOnWorkerThread(&device, thread_index); | |
45 } | 41 } |
46 virtual void CompleteOnOriginThread() OVERRIDE { | 42 virtual void CompleteOnOriginThread() OVERRIDE { |
47 reply_.Run(!HasFinishedRunning()); | 43 reply_.Run(!HasFinishedRunning()); |
48 } | 44 } |
49 | 45 |
50 private: | 46 private: |
51 virtual ~ImageWorkerPoolTaskImpl() {} | 47 virtual ~ImageWorkerPoolTaskImpl() {} |
52 | 48 |
53 scoped_refptr<internal::RasterWorkerPoolTask> task_; | 49 scoped_refptr<internal::RasterWorkerPoolTask> task_; |
54 uint8_t* buffer_; | 50 uint8_t* buffer_; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 145 |
150 set_raster_finished_task(new_raster_finished_task); | 146 set_raster_finished_task(new_raster_finished_task); |
151 set_raster_required_for_activation_finished_task( | 147 set_raster_required_for_activation_finished_task( |
152 new_raster_required_for_activation_finished_task); | 148 new_raster_required_for_activation_finished_task); |
153 | 149 |
154 TRACE_EVENT_ASYNC_STEP1( | 150 TRACE_EVENT_ASYNC_STEP1( |
155 "cc", "ScheduledTasks", this, "rasterizing", | 151 "cc", "ScheduledTasks", this, "rasterizing", |
156 "state", TracedValue::FromValue(StateAsValue().release())); | 152 "state", TracedValue::FromValue(StateAsValue().release())); |
157 } | 153 } |
158 | 154 |
159 GLenum ImageRasterWorkerPool::GetResourceFormat() const { | 155 ResourceFormat ImageRasterWorkerPool::GetResourceFormat() const { |
160 return GL_RGBA; // Only format supported by CHROMIUM_map_image | 156 // Only format supported by CHROMIUM_map_image |
| 157 return RGBA_8888; |
161 } | 158 } |
162 | 159 |
163 void ImageRasterWorkerPool::OnRasterTasksFinished() { | 160 void ImageRasterWorkerPool::OnRasterTasksFinished() { |
164 DCHECK(raster_tasks_pending_); | 161 DCHECK(raster_tasks_pending_); |
165 raster_tasks_pending_ = false; | 162 raster_tasks_pending_ = false; |
166 TRACE_EVENT_ASYNC_END0("cc", "ScheduledTasks", this); | 163 TRACE_EVENT_ASYNC_END0("cc", "ScheduledTasks", this); |
167 client()->DidFinishRunningTasks(); | 164 client()->DidFinishRunningTasks(); |
168 } | 165 } |
169 | 166 |
170 void ImageRasterWorkerPool::OnRasterTasksRequiredForActivationFinished() { | 167 void ImageRasterWorkerPool::OnRasterTasksRequiredForActivationFinished() { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 if (is_required_for_activation) { | 218 if (is_required_for_activation) { |
222 raster_required_for_activation_finished_node->add_dependency(); | 219 raster_required_for_activation_finished_node->add_dependency(); |
223 image_node->add_dependent(raster_required_for_activation_finished_node); | 220 image_node->add_dependent(raster_required_for_activation_finished_node); |
224 } | 221 } |
225 | 222 |
226 raster_finished_node->add_dependency(); | 223 raster_finished_node->add_dependency(); |
227 image_node->add_dependent(raster_finished_node); | 224 image_node->add_dependent(raster_finished_node); |
228 } | 225 } |
229 | 226 |
230 } // namespace cc | 227 } // namespace cc |
OLD | NEW |