| 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/image_copy_raster_worker_pool.h" | 5 #include "cc/resources/image_copy_raster_worker_pool.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "cc/debug/traced_value.h" | 10 #include "cc/debug/traced_value.h" |
| 11 #include "cc/resources/resource_pool.h" | 11 #include "cc/resources/resource_pool.h" |
| 12 #include "cc/resources/scoped_resource.h" | 12 #include "cc/resources/scoped_resource.h" |
| 13 #include "gpu/command_buffer/client/gles2_interface.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 // static | 17 // static |
| 17 scoped_ptr<RasterWorkerPool> ImageCopyRasterWorkerPool::Create( | 18 scoped_ptr<RasterWorkerPool> ImageCopyRasterWorkerPool::Create( |
| 18 base::SequencedTaskRunner* task_runner, | 19 base::SequencedTaskRunner* task_runner, |
| 19 TaskGraphRunner* task_graph_runner, | 20 TaskGraphRunner* task_graph_runner, |
| 21 ContextProvider* context_provider, |
| 20 ResourceProvider* resource_provider, | 22 ResourceProvider* resource_provider, |
| 21 ResourcePool* resource_pool) { | 23 ResourcePool* resource_pool) { |
| 22 return make_scoped_ptr<RasterWorkerPool>(new ImageCopyRasterWorkerPool( | 24 return make_scoped_ptr<RasterWorkerPool>( |
| 23 task_runner, task_graph_runner, resource_provider, resource_pool)); | 25 new ImageCopyRasterWorkerPool(task_runner, |
| 26 task_graph_runner, |
| 27 context_provider, |
| 28 resource_provider, |
| 29 resource_pool)); |
| 24 } | 30 } |
| 25 | 31 |
| 26 ImageCopyRasterWorkerPool::ImageCopyRasterWorkerPool( | 32 ImageCopyRasterWorkerPool::ImageCopyRasterWorkerPool( |
| 27 base::SequencedTaskRunner* task_runner, | 33 base::SequencedTaskRunner* task_runner, |
| 28 TaskGraphRunner* task_graph_runner, | 34 TaskGraphRunner* task_graph_runner, |
| 35 ContextProvider* context_provider, |
| 29 ResourceProvider* resource_provider, | 36 ResourceProvider* resource_provider, |
| 30 ResourcePool* resource_pool) | 37 ResourcePool* resource_pool) |
| 31 : task_runner_(task_runner), | 38 : task_runner_(task_runner), |
| 32 task_graph_runner_(task_graph_runner), | 39 task_graph_runner_(task_graph_runner), |
| 33 namespace_token_(task_graph_runner->GetNamespaceToken()), | 40 namespace_token_(task_graph_runner->GetNamespaceToken()), |
| 41 context_provider_(context_provider), |
| 34 resource_provider_(resource_provider), | 42 resource_provider_(resource_provider), |
| 35 resource_pool_(resource_pool), | 43 resource_pool_(resource_pool), |
| 36 has_performed_copy_since_last_flush_(false), | 44 has_performed_copy_since_last_flush_(false), |
| 37 raster_tasks_pending_(false), | 45 raster_tasks_pending_(false), |
| 38 raster_tasks_required_for_activation_pending_(false), | 46 raster_tasks_required_for_activation_pending_(false), |
| 39 raster_finished_weak_ptr_factory_(this) {} | 47 raster_finished_weak_ptr_factory_(this) { |
| 48 } |
| 40 | 49 |
| 41 ImageCopyRasterWorkerPool::~ImageCopyRasterWorkerPool() { | 50 ImageCopyRasterWorkerPool::~ImageCopyRasterWorkerPool() { |
| 42 DCHECK_EQ(0u, raster_task_states_.size()); | 51 DCHECK_EQ(0u, raster_task_states_.size()); |
| 43 } | 52 } |
| 44 | 53 |
| 45 Rasterizer* ImageCopyRasterWorkerPool::AsRasterizer() { return this; } | 54 Rasterizer* ImageCopyRasterWorkerPool::AsRasterizer() { return this; } |
| 46 | 55 |
| 47 void ImageCopyRasterWorkerPool::SetClient(RasterizerClient* client) { | 56 void ImageCopyRasterWorkerPool::SetClient(RasterizerClient* client) { |
| 48 client_ = client; | 57 client_ = client; |
| 49 } | 58 } |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 "rasterizing", | 228 "rasterizing", |
| 220 "state", | 229 "state", |
| 221 TracedValue::FromValue(StateAsValue().release())); | 230 TracedValue::FromValue(StateAsValue().release())); |
| 222 client_->DidFinishRunningTasksRequiredForActivation(); | 231 client_->DidFinishRunningTasksRequiredForActivation(); |
| 223 } | 232 } |
| 224 | 233 |
| 225 void ImageCopyRasterWorkerPool::FlushCopies() { | 234 void ImageCopyRasterWorkerPool::FlushCopies() { |
| 226 if (!has_performed_copy_since_last_flush_) | 235 if (!has_performed_copy_since_last_flush_) |
| 227 return; | 236 return; |
| 228 | 237 |
| 229 resource_provider_->ShallowFlushIfSupported(); | 238 if (context_provider_) |
| 239 context_provider_->ContextGL()->ShallowFlushCHROMIUM(); |
| 230 has_performed_copy_since_last_flush_ = false; | 240 has_performed_copy_since_last_flush_ = false; |
| 231 } | 241 } |
| 232 | 242 |
| 233 scoped_ptr<base::Value> ImageCopyRasterWorkerPool::StateAsValue() const { | 243 scoped_ptr<base::Value> ImageCopyRasterWorkerPool::StateAsValue() const { |
| 234 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue); | 244 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue); |
| 235 | 245 |
| 236 state->SetInteger("pending_count", raster_task_states_.size()); | 246 state->SetInteger("pending_count", raster_task_states_.size()); |
| 237 state->SetBoolean("tasks_required_for_activation_pending", | 247 state->SetBoolean("tasks_required_for_activation_pending", |
| 238 raster_tasks_required_for_activation_pending_); | 248 raster_tasks_required_for_activation_pending_); |
| 239 state->Set("staging_state", StagingStateAsValue().release()); | 249 state->Set("staging_state", StagingStateAsValue().release()); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 251 resource_pool_->total_resource_count() - | 261 resource_pool_->total_resource_count() - |
| 252 resource_pool_->acquired_resource_count()); | 262 resource_pool_->acquired_resource_count()); |
| 253 staging_state->SetInteger("bytes_pending_copy", | 263 staging_state->SetInteger("bytes_pending_copy", |
| 254 resource_pool_->total_memory_usage_bytes() - | 264 resource_pool_->total_memory_usage_bytes() - |
| 255 resource_pool_->acquired_memory_usage_bytes()); | 265 resource_pool_->acquired_memory_usage_bytes()); |
| 256 | 266 |
| 257 return staging_state.PassAs<base::Value>(); | 267 return staging_state.PassAs<base::Value>(); |
| 258 } | 268 } |
| 259 | 269 |
| 260 } // namespace cc | 270 } // namespace cc |
| OLD | NEW |