OLD | NEW |
---|---|
1 // Copyright 2013 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_IMAGE_RASTER_WORKER_POOL_H_ | 5 #ifndef CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |
6 #define CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_ | 6 #define CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |
7 | 7 |
8 #include "cc/resources/raster_worker_pool.h" | 8 #include "cc/resources/raster_worker_pool.h" |
9 | 9 |
10 namespace cc { | 10 namespace cc { |
11 | 11 |
12 class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { | 12 class CC_EXPORT DirectRasterWorkerPool : public RasterWorkerPool { |
13 public: | 13 public: |
14 virtual ~ImageRasterWorkerPool(); | 14 virtual ~DirectRasterWorkerPool(); |
15 | 15 |
16 static scoped_ptr<RasterWorkerPool> Create( | 16 static scoped_ptr<RasterWorkerPool> Create( |
17 ResourceProvider* resource_provider, | 17 ResourceProvider* resource_provider, |
18 ContextProvider* context_provider, | 18 ContextProvider* context_provider); |
19 unsigned texture_target); | |
20 | 19 |
21 // Overridden from RasterWorkerPool: | 20 // Overridden from RasterWorkerPool: |
22 virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE; | 21 virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; |
alokp
2014/02/14 18:50:59
Is it necessary to make this change in this patch?
reveman
2014/02/14 23:30:52
Done.
| |
23 virtual unsigned GetResourceTarget() const OVERRIDE; | 22 virtual unsigned GetResourceTarget() const OVERRIDE; |
24 virtual ResourceFormat GetResourceFormat() const OVERRIDE; | 23 virtual ResourceFormat GetResourceFormat() const OVERRIDE; |
25 virtual void CheckForCompletedTasks() OVERRIDE; | 24 virtual void CheckForCompletedTasks() OVERRIDE; |
26 | 25 |
27 // Overridden from internal::WorkerPoolTaskClient: | 26 // Overridden from internal::WorkerPoolTaskClient: |
28 virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task) | 27 virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task) |
29 OVERRIDE; | 28 OVERRIDE; |
30 virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task, | 29 virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task, |
31 const PicturePileImpl::Analysis& analysis) | 30 const PicturePileImpl::Analysis& analysis) |
32 OVERRIDE; | 31 OVERRIDE; |
33 virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE; | 32 virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE { |
33 } | |
34 | 34 |
35 protected: | 35 protected: |
36 ImageRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner, | 36 DirectRasterWorkerPool(ResourceProvider* resource_provider, |
37 ResourceProvider* resource_provider, | 37 ContextProvider* context_provider); |
38 ContextProvider* context_provider, | |
39 unsigned texture_target); | |
40 | 38 |
41 private: | 39 private: |
42 // Overridden from RasterWorkerPool: | 40 // Overridden from RasterWorkerPool: |
43 virtual void OnRasterTasksFinished() OVERRIDE; | 41 virtual void OnRasterTasksFinished() OVERRIDE; |
44 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; | 42 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; |
45 | 43 |
46 scoped_ptr<base::Value> StateAsValue() const; | 44 void ScheduleRunTasksOnOriginThread(); |
45 void RunTasksOnOriginThread(); | |
47 | 46 |
48 const unsigned texture_target_; | 47 ContextProvider* context_provider_; |
49 | 48 |
50 RasterTask::Queue raster_tasks_; | 49 bool run_tasks_on_origin_thread_pending_; |
alokp
2014/02/14 18:50:59
nit: can it be just tasks_pending_ for now?
reveman
2014/02/14 23:30:52
I like having this name match ScheduleRunTasksOnOr
| |
50 | |
51 RasterTaskQueue raster_tasks_; | |
51 | 52 |
52 bool raster_tasks_pending_; | 53 bool raster_tasks_pending_; |
53 bool raster_tasks_required_for_activation_pending_; | 54 bool raster_tasks_required_for_activation_pending_; |
54 | 55 |
55 // Task graph used when scheduling tasks and vector used to gather | 56 internal::WorkerPoolTask::Vector completed_tasks_; |
56 // completed tasks. | |
57 internal::TaskGraph graph_; | |
58 internal::Task::Vector completed_tasks_; | |
59 | 57 |
60 DISALLOW_COPY_AND_ASSIGN(ImageRasterWorkerPool); | 58 base::WeakPtrFactory<DirectRasterWorkerPool> weak_factory_; |
59 | |
60 DISALLOW_COPY_AND_ASSIGN(DirectRasterWorkerPool); | |
61 }; | 61 }; |
62 | 62 |
63 } // namespace cc | 63 } // namespace cc |
64 | 64 |
65 #endif // CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_ | 65 #endif // CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |
OLD | NEW |