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

Unified Diff: cc/raster/one_copy_tile_task_worker_pool.h

Issue 1470113002: Move TaskGraph creation to TileManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pinchfix
Patch Set: remove unnecessary include Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: cc/raster/one_copy_tile_task_worker_pool.h
diff --git a/cc/raster/one_copy_tile_task_worker_pool.h b/cc/raster/one_copy_tile_task_worker_pool.h
index 08445b03dc6ce02111404dee19832c13f0edae03..a6dc9ad9c4fc3a3c093aed4bda329887d23ee24e 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.h
+++ b/cc/raster/one_copy_tile_task_worker_pool.h
@@ -56,9 +56,8 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
TileTaskRunner* AsTileTaskRunner() override;
// Overridden from TileTaskRunner:
- void SetClient(TileTaskRunnerClient* client) override;
void Shutdown() override;
- void ScheduleTasks(TileTaskQueue* queue) override;
+ void ScheduleTasks(TaskGraph* graph) override;
void CheckForCompletedTasks() override;
ResourceFormat GetResourceFormat(bool must_support_alpha) const override;
bool GetResourceRequiresSwizzle(bool must_support_alpha) const override;
@@ -127,7 +126,6 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
void ReduceMemoryUsage();
void ReleaseBuffersNotUsedSince(base::TimeTicks time);
- void OnTaskSetFinished(TaskSet task_set);
scoped_refptr<base::trace_event::ConvertableToTraceFormat> StateAsValue()
const;
void StagingStateAsValueInto(
@@ -136,16 +134,13 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
scoped_refptr<base::SequencedTaskRunner> task_runner_;
TaskGraphRunner* task_graph_runner_;
const NamespaceToken namespace_token_;
- TileTaskRunnerClient* client_;
ResourceProvider* const resource_provider_;
const int max_bytes_per_copy_operation_;
const bool use_partial_raster_;
- TaskSetCollection tasks_pending_;
- scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets];
// Task graph used when scheduling tasks and vector used to gather
// completed tasks.
- TaskGraph graph_;
+ TaskGraph* graph_;
reveman 2015/12/02 22:26:05 ditto
ericrk 2015/12/03 00:43:21 Done.
Task::Vector completed_tasks_;
mutable base::Lock lock_;
@@ -165,10 +160,6 @@ class CC_EXPORT OneCopyTileTaskWorkerPool
base::Closure reduce_memory_usage_callback_;
base::WeakPtrFactory<OneCopyTileTaskWorkerPool> weak_ptr_factory_;
- // "raster finished" tasks need their own factory as they need to be
- // canceled when ScheduleTasks() is called.
- base::WeakPtrFactory<OneCopyTileTaskWorkerPool>
- task_set_finished_weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool);
};

Powered by Google App Engine
This is Rietveld 408576698