| 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 #ifndef CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ | 5 #ifndef CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| 6 #define CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ | 6 #define CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "cc/resources/tile_task_runner.h" | 10 #include "cc/resources/tile_task_runner.h" |
| 11 #include "cc/resources/tile_task_worker_pool.h" | 11 #include "cc/resources/tile_task_worker_pool.h" |
| 12 | 12 |
| 13 namespace base { | 13 namespace base { |
| 14 namespace trace_event { | 14 namespace trace_event { |
| 15 class ConvertableToTraceFormat; | 15 class ConvertableToTraceFormat; |
| 16 } | 16 } |
| 17 | |
| 18 // TODO(ssid): remove these aliases after the tracing clients are moved to the | |
| 19 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 | |
| 20 namespace debug { | |
| 21 using ::base::trace_event::ConvertableToTraceFormat; | |
| 22 } | 17 } |
| 23 } // namespace base | |
| 24 | 18 |
| 25 namespace cc { | 19 namespace cc { |
| 26 class ResourceProvider; | 20 class ResourceProvider; |
| 27 | 21 |
| 28 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, | 22 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, |
| 29 public TileTaskRunner, | 23 public TileTaskRunner, |
| 30 public TileTaskClient { | 24 public TileTaskClient { |
| 31 public: | 25 public: |
| 32 ~BitmapTileTaskWorkerPool() override; | 26 ~BitmapTileTaskWorkerPool() override; |
| 33 | 27 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 51 const Resource* resource) override; | 45 const Resource* resource) override; |
| 52 void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; | 46 void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; |
| 53 | 47 |
| 54 protected: | 48 protected: |
| 55 BitmapTileTaskWorkerPool(base::SequencedTaskRunner* task_runner, | 49 BitmapTileTaskWorkerPool(base::SequencedTaskRunner* task_runner, |
| 56 TaskGraphRunner* task_graph_runner, | 50 TaskGraphRunner* task_graph_runner, |
| 57 ResourceProvider* resource_provider); | 51 ResourceProvider* resource_provider); |
| 58 | 52 |
| 59 private: | 53 private: |
| 60 void OnTaskSetFinished(TaskSet task_set); | 54 void OnTaskSetFinished(TaskSet task_set); |
| 61 scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const; | 55 scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue() |
| 56 const; |
| 62 | 57 |
| 63 scoped_refptr<base::SequencedTaskRunner> task_runner_; | 58 scoped_refptr<base::SequencedTaskRunner> task_runner_; |
| 64 TaskGraphRunner* task_graph_runner_; | 59 TaskGraphRunner* task_graph_runner_; |
| 65 const NamespaceToken namespace_token_; | 60 const NamespaceToken namespace_token_; |
| 66 TileTaskRunnerClient* client_; | 61 TileTaskRunnerClient* client_; |
| 67 ResourceProvider* resource_provider_; | 62 ResourceProvider* resource_provider_; |
| 68 | 63 |
| 69 TaskSetCollection tasks_pending_; | 64 TaskSetCollection tasks_pending_; |
| 70 | 65 |
| 71 scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets]; | 66 scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets]; |
| 72 | 67 |
| 73 // Task graph used when scheduling tasks and vector used to gather | 68 // Task graph used when scheduling tasks and vector used to gather |
| 74 // completed tasks. | 69 // completed tasks. |
| 75 TaskGraph graph_; | 70 TaskGraph graph_; |
| 76 Task::Vector completed_tasks_; | 71 Task::Vector completed_tasks_; |
| 77 | 72 |
| 78 base::WeakPtrFactory<BitmapTileTaskWorkerPool> | 73 base::WeakPtrFactory<BitmapTileTaskWorkerPool> |
| 79 task_set_finished_weak_ptr_factory_; | 74 task_set_finished_weak_ptr_factory_; |
| 80 | 75 |
| 81 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool); | 76 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool); |
| 82 }; | 77 }; |
| 83 | 78 |
| 84 } // namespace cc | 79 } // namespace cc |
| 85 | 80 |
| 86 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ | 81 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| OLD | NEW |