Index: cc/resources/direct_raster_worker_pool.h |
diff --git a/cc/resources/image_raster_worker_pool.h b/cc/resources/direct_raster_worker_pool.h |
similarity index 52% |
copy from cc/resources/image_raster_worker_pool.h |
copy to cc/resources/direct_raster_worker_pool.h |
index b3b8ad80363a1958fa32b8acb2e79cd3582aaed3..ac53f2c6d6eeb6f492bae81600672b4ba2bf8f66 100644 |
--- a/cc/resources/image_raster_worker_pool.h |
+++ b/cc/resources/direct_raster_worker_pool.h |
@@ -1,25 +1,24 @@ |
-// Copyright 2013 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_ |
-#define CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_ |
+#ifndef CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |
+#define CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |
#include "cc/resources/raster_worker_pool.h" |
namespace cc { |
-class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
+class CC_EXPORT DirectRasterWorkerPool : public RasterWorkerPool { |
public: |
- virtual ~ImageRasterWorkerPool(); |
+ virtual ~DirectRasterWorkerPool(); |
static scoped_ptr<RasterWorkerPool> Create( |
ResourceProvider* resource_provider, |
- ContextProvider* context_provider, |
- unsigned texture_target); |
+ ContextProvider* context_provider); |
// Overridden from RasterWorkerPool: |
- virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE; |
+ 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.
|
virtual unsigned GetResourceTarget() const OVERRIDE; |
virtual ResourceFormat GetResourceFormat() const OVERRIDE; |
virtual void CheckForCompletedTasks() OVERRIDE; |
@@ -30,36 +29,37 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool { |
virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task, |
const PicturePileImpl::Analysis& analysis) |
OVERRIDE; |
- virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE; |
+ virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE { |
+ } |
protected: |
- ImageRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner, |
- ResourceProvider* resource_provider, |
- ContextProvider* context_provider, |
- unsigned texture_target); |
+ DirectRasterWorkerPool(ResourceProvider* resource_provider, |
+ ContextProvider* context_provider); |
private: |
// Overridden from RasterWorkerPool: |
virtual void OnRasterTasksFinished() OVERRIDE; |
virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE; |
- scoped_ptr<base::Value> StateAsValue() const; |
+ void ScheduleRunTasksOnOriginThread(); |
+ void RunTasksOnOriginThread(); |
- const unsigned texture_target_; |
+ ContextProvider* context_provider_; |
- RasterTask::Queue raster_tasks_; |
+ 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
|
+ |
+ RasterTaskQueue raster_tasks_; |
bool raster_tasks_pending_; |
bool raster_tasks_required_for_activation_pending_; |
- // Task graph used when scheduling tasks and vector used to gather |
- // completed tasks. |
- internal::TaskGraph graph_; |
- internal::Task::Vector completed_tasks_; |
+ internal::WorkerPoolTask::Vector completed_tasks_; |
+ |
+ base::WeakPtrFactory<DirectRasterWorkerPool> weak_factory_; |
- DISALLOW_COPY_AND_ASSIGN(ImageRasterWorkerPool); |
+ DISALLOW_COPY_AND_ASSIGN(DirectRasterWorkerPool); |
}; |
} // namespace cc |
-#endif // CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_ |
+#endif // CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_ |