| 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 "cc/debug/traced_value.h" | 8 #include "base/debug/traced_value.h" |
| 9 #include "cc/resources/resource.h" | 9 #include "cc/resources/resource.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 | 12 |
| 13 // static | 13 // static |
| 14 scoped_ptr<RasterWorkerPool> ImageRasterWorkerPool::Create( | 14 scoped_ptr<RasterWorkerPool> ImageRasterWorkerPool::Create( |
| 15 base::SequencedTaskRunner* task_runner, | 15 base::SequencedTaskRunner* task_runner, |
| 16 TaskGraphRunner* task_graph_runner, | 16 TaskGraphRunner* task_graph_runner, |
| 17 ResourceProvider* resource_provider) { | 17 ResourceProvider* resource_provider) { |
| 18 return make_scoped_ptr<RasterWorkerPool>(new ImageRasterWorkerPool( | 18 return make_scoped_ptr<RasterWorkerPool>(new ImageRasterWorkerPool( |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 raster_finished_task_ = new_raster_finished_task; | 116 raster_finished_task_ = new_raster_finished_task; |
| 117 raster_required_for_activation_finished_task_ = | 117 raster_required_for_activation_finished_task_ = |
| 118 new_raster_required_for_activation_finished_task; | 118 new_raster_required_for_activation_finished_task; |
| 119 | 119 |
| 120 TRACE_EVENT_ASYNC_STEP_INTO1( | 120 TRACE_EVENT_ASYNC_STEP_INTO1( |
| 121 "cc", | 121 "cc", |
| 122 "ScheduledTasks", | 122 "ScheduledTasks", |
| 123 this, | 123 this, |
| 124 "rasterizing", | 124 "rasterizing", |
| 125 "state", | 125 "state", |
| 126 TracedValue::FromValue(StateAsValue().release())); | 126 base::debug::TracedValue::FromValue(StateAsValue().release())); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void ImageRasterWorkerPool::CheckForCompletedTasks() { | 129 void ImageRasterWorkerPool::CheckForCompletedTasks() { |
| 130 TRACE_EVENT0("cc", "ImageRasterWorkerPool::CheckForCompletedTasks"); | 130 TRACE_EVENT0("cc", "ImageRasterWorkerPool::CheckForCompletedTasks"); |
| 131 | 131 |
| 132 task_graph_runner_->CollectCompletedTasks(namespace_token_, | 132 task_graph_runner_->CollectCompletedTasks(namespace_token_, |
| 133 &completed_tasks_); | 133 &completed_tasks_); |
| 134 for (Task::Vector::const_iterator it = completed_tasks_.begin(); | 134 for (Task::Vector::const_iterator it = completed_tasks_.begin(); |
| 135 it != completed_tasks_.end(); | 135 it != completed_tasks_.end(); |
| 136 ++it) { | 136 ++it) { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 "ImageRasterWorkerPool::OnRasterRequiredForActivationFinished"); | 172 "ImageRasterWorkerPool::OnRasterRequiredForActivationFinished"); |
| 173 | 173 |
| 174 DCHECK(raster_tasks_required_for_activation_pending_); | 174 DCHECK(raster_tasks_required_for_activation_pending_); |
| 175 raster_tasks_required_for_activation_pending_ = false; | 175 raster_tasks_required_for_activation_pending_ = false; |
| 176 TRACE_EVENT_ASYNC_STEP_INTO1( | 176 TRACE_EVENT_ASYNC_STEP_INTO1( |
| 177 "cc", | 177 "cc", |
| 178 "ScheduledTasks", | 178 "ScheduledTasks", |
| 179 this, | 179 this, |
| 180 "rasterizing", | 180 "rasterizing", |
| 181 "state", | 181 "state", |
| 182 TracedValue::FromValue(StateAsValue().release())); | 182 base::debug::TracedValue::FromValue(StateAsValue().release())); |
| 183 client_->DidFinishRunningTasksRequiredForActivation(); | 183 client_->DidFinishRunningTasksRequiredForActivation(); |
| 184 } | 184 } |
| 185 | 185 |
| 186 scoped_ptr<base::Value> ImageRasterWorkerPool::StateAsValue() const { | 186 scoped_ptr<base::Value> ImageRasterWorkerPool::StateAsValue() const { |
| 187 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue); | 187 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue); |
| 188 | 188 |
| 189 state->SetBoolean("tasks_required_for_activation_pending", | 189 state->SetBoolean("tasks_required_for_activation_pending", |
| 190 raster_tasks_required_for_activation_pending_); | 190 raster_tasks_required_for_activation_pending_); |
| 191 return state.PassAs<base::Value>(); | 191 return state.PassAs<base::Value>(); |
| 192 } | 192 } |
| 193 | 193 |
| 194 } // namespace cc | 194 } // namespace cc |
| OLD | NEW |