Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side Diff: cc/resources/pixel_buffer_raster_worker_pool.h

Issue 170783007: Re-land: cc: Cleanup internal::WorkerPoolTaskClient interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad DCHECK Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 5 #ifndef CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
6 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 6 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "cc/resources/raster_worker_pool.h" 11 #include "cc/resources/raster_worker_pool.h"
12 12
13 #if defined(COMPILER_GCC) 13 #if defined(COMPILER_GCC)
14 namespace BASE_HASH_NAMESPACE { 14 namespace BASE_HASH_NAMESPACE {
15 template <> 15 template <>
16 struct hash<cc::internal::RasterWorkerPoolTask*> { 16 struct hash<cc::internal::WorkerPoolTask*> {
17 size_t operator()(cc::internal::RasterWorkerPoolTask* ptr) const { 17 size_t operator()(cc::internal::WorkerPoolTask* ptr) const {
18 return hash<size_t>()(reinterpret_cast<size_t>(ptr)); 18 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
19 } 19 }
20 }; 20 };
21 } // namespace BASE_HASH_NAMESPACE 21 } // namespace BASE_HASH_NAMESPACE
22 #endif // COMPILER 22 #endif // COMPILER
23 23
24 namespace cc { 24 namespace cc {
25 25
26 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool { 26 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
27 public: 27 public:
28 virtual ~PixelBufferRasterWorkerPool(); 28 virtual ~PixelBufferRasterWorkerPool();
29 29
30 static scoped_ptr<RasterWorkerPool> Create( 30 static scoped_ptr<RasterWorkerPool> Create(
31 ResourceProvider* resource_provider, 31 ResourceProvider* resource_provider,
32 size_t max_transfer_buffer_usage_bytes); 32 size_t max_transfer_buffer_usage_bytes);
33 33
34 // Overridden from RasterWorkerPool: 34 // Overridden from RasterWorkerPool:
35 virtual void Shutdown() OVERRIDE; 35 virtual void Shutdown() OVERRIDE;
36 virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; 36 virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE;
37 virtual unsigned GetResourceTarget() const OVERRIDE; 37 virtual unsigned GetResourceTarget() const OVERRIDE;
38 virtual ResourceFormat GetResourceFormat() const OVERRIDE; 38 virtual ResourceFormat GetResourceFormat() const OVERRIDE;
39 virtual void CheckForCompletedTasks() OVERRIDE; 39 virtual void CheckForCompletedTasks() OVERRIDE;
40 40
41 // Overridden from internal::WorkerPoolTaskClient: 41 // Overridden from internal::WorkerPoolTaskClient:
42 virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task) 42 virtual SkCanvas* AcquireCanvasForRaster(internal::WorkerPoolTask* task,
43 OVERRIDE; 43 const Resource* resource) OVERRIDE;
44 virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task, 44 virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
45 const PicturePileImpl::Analysis& analysis) 45 const Resource* resource) OVERRIDE;
46 OVERRIDE;
47 virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE;
48 46
49 protected: 47 protected:
50 PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner, 48 PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner,
51 ResourceProvider* resource_provider, 49 ResourceProvider* resource_provider,
52 size_t max_transfer_buffer_usage_bytes); 50 size_t max_transfer_buffer_usage_bytes);
53 51
54 private: 52 private:
55 enum RasterTaskState { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED }; 53 struct RasterTaskState {
56 typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> > 54 RasterTaskState() : type(UNSCHEDULED), resource(NULL) {}
57 RasterTaskDeque; 55 enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
58 typedef internal::RasterWorkerPoolTask* RasterTaskMapKey; 56 const Resource* resource;
57 };
58 typedef internal::WorkerPoolTask* RasterTaskMapKey;
59 typedef base::hash_set<RasterTaskMapKey> RasterTaskSet; 59 typedef base::hash_set<RasterTaskMapKey> RasterTaskSet;
60 typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap; 60 typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap;
61 61
62 // Overridden from RasterWorkerPool: 62 // Overridden from RasterWorkerPool:
63 virtual void OnRasterTasksFinished() OVERRIDE; 63 virtual void OnRasterTasksFinished() OVERRIDE;
64 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; 64 virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
65 65
66 void FlushUploads(); 66 void FlushUploads();
67 void CheckForCompletedUploads(); 67 void CheckForCompletedUploads();
68 void ScheduleCheckForCompletedRasterTasks(); 68 void ScheduleCheckForCompletedRasterTasks();
69 void OnCheckForCompletedRasterTasks(); 69 void OnCheckForCompletedRasterTasks();
70 void CheckForCompletedRasterTasks(); 70 void CheckForCompletedRasterTasks();
71 void ScheduleMoreTasks(); 71 void ScheduleMoreTasks();
72 unsigned PendingRasterTaskCount() const; 72 unsigned PendingRasterTaskCount() const;
73 bool HasPendingTasks() const; 73 bool HasPendingTasks() const;
74 bool HasPendingTasksRequiredForActivation() const; 74 bool HasPendingTasksRequiredForActivation() const;
75 void CheckForCompletedWorkerPoolTasks(); 75 void CheckForCompletedWorkerPoolTasks();
76 bool IsRasterTaskRequiredForActivation(internal::RasterWorkerPoolTask* task) 76 bool IsRasterTaskRequiredForActivation(internal::WorkerPoolTask* task) const;
77 const;
78 77
79 const char* StateName() const; 78 const char* StateName() const;
80 scoped_ptr<base::Value> StateAsValue() const; 79 scoped_ptr<base::Value> StateAsValue() const;
81 scoped_ptr<base::Value> ThrottleStateAsValue() const; 80 scoped_ptr<base::Value> ThrottleStateAsValue() const;
82 81
83 bool shutdown_; 82 bool shutdown_;
84 83
85 RasterTaskQueue raster_tasks_; 84 RasterTaskQueue raster_tasks_;
86 RasterTaskSet raster_tasks_required_for_activation_; 85 RasterTaskSet raster_tasks_required_for_activation_;
87 RasterTaskStateMap raster_task_states_; 86 RasterTaskStateMap raster_task_states_;
88 RasterTaskDeque raster_tasks_with_pending_upload_; 87 TaskDeque raster_tasks_with_pending_upload_;
89 RasterTaskDeque completed_raster_tasks_; 88 TaskDeque completed_raster_tasks_;
90 TaskDeque completed_image_decode_tasks_; 89 TaskDeque completed_image_decode_tasks_;
91 90
92 size_t scheduled_raster_task_count_; 91 size_t scheduled_raster_task_count_;
93 size_t bytes_pending_upload_; 92 size_t bytes_pending_upload_;
94 size_t max_bytes_pending_upload_; 93 size_t max_bytes_pending_upload_;
95 bool has_performed_uploads_since_last_flush_; 94 bool has_performed_uploads_since_last_flush_;
96 base::TimeTicks check_for_completed_raster_tasks_time_; 95 base::TimeTicks check_for_completed_raster_tasks_time_;
97 bool check_for_completed_raster_tasks_pending_; 96 bool check_for_completed_raster_tasks_pending_;
98 97
99 bool should_notify_client_if_no_tasks_are_pending_; 98 bool should_notify_client_if_no_tasks_are_pending_;
100 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_; 99 bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
101 bool raster_finished_task_pending_; 100 bool raster_finished_task_pending_;
102 bool raster_required_for_activation_finished_task_pending_; 101 bool raster_required_for_activation_finished_task_pending_;
103 102
104 // Task graph used when scheduling tasks and vector used to gather 103 // Task graph used when scheduling tasks and vector used to gather
105 // completed tasks. 104 // completed tasks.
106 internal::TaskGraph graph_; 105 internal::TaskGraph graph_;
107 internal::Task::Vector completed_tasks_; 106 internal::Task::Vector completed_tasks_;
108 107
109 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_; 108 base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_;
110 109
111 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool); 110 DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
112 }; 111 };
113 112
114 } // namespace cc 113 } // namespace cc
115 114
116 #endif // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_ 115 #endif // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « cc/resources/image_raster_worker_pool.cc ('k') | cc/resources/pixel_buffer_raster_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698