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

Unified Diff: cc/tiles/tile_manager_unittest.cc

Issue 1470113002: Move TaskGraph creation to TileManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pinchfix
Patch Set: 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
« cc/tiles/tile_manager.cc ('K') | « cc/tiles/tile_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager_unittest.cc
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index f6ec9c014de9d5d996284fa8d6cf627afb9ebca3..39a649965c3205a7f6931dee031d1ae38c4e9415 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -1698,7 +1698,6 @@ class FakeTileTaskRunner : public TileTaskRunner, public TileTaskClient {
~FakeTileTaskRunner() override {}
// TileTaskRunner methods.
- void SetClient(TileTaskRunnerClient* client) override {}
void Shutdown() override {}
void CheckForCompletedTasks() override {}
ResourceFormat GetResourceFormat(bool must_support_alpha) const override {
@@ -1708,7 +1707,7 @@ class FakeTileTaskRunner : public TileTaskRunner, public TileTaskClient {
return false;
}
- void ScheduleTasks(TileTaskQueue* queue) override {}
+ void ScheduleTasks(scoped_ptr<TaskGraph> graph) override {}
// TileTaskClient methods.
scoped_ptr<RasterBuffer> AcquireBufferForRaster(
@@ -1727,11 +1726,11 @@ class CancellingTileTaskRunner : public FakeTileTaskRunner {
CancellingTileTaskRunner() {}
~CancellingTileTaskRunner() override {}
- void ScheduleTasks(TileTaskQueue* queue) override {
+ void ScheduleTasks(scoped_ptr<TaskGraph> graph) override {
// Just call CompleteOnOriginThread on each item in the queue. As none of
// these items have run yet, they will be treated as cancelled tasks.
- for (const auto& task : queue->items) {
- task.task->CompleteOnOriginThread(this);
+ for (const auto& node : graph->nodes) {
+ static_cast<RasterTask*>(node.task)->CompleteOnOriginThread(this);
}
}
};
@@ -1804,12 +1803,13 @@ class VerifyResourceContentIdTileTaskRunner : public FakeTileTaskRunner {
: expected_resource_id_(expected_resource_id) {}
~VerifyResourceContentIdTileTaskRunner() override {}
- void ScheduleTasks(TileTaskQueue* queue) override {
- for (const auto& task : queue->items) {
+ void ScheduleTasks(scoped_ptr<TaskGraph> graph) override {
+ for (const auto& node : graph->nodes) {
+ RasterTask* task = static_cast<RasterTask*>(node.task);
// Triggers a call to AcquireBufferForRaster.
- task.task->ScheduleOnOriginThread(this);
+ task->ScheduleOnOriginThread(this);
// Calls TileManager as though task was cancelled.
- task.task->CompleteOnOriginThread(this);
+ task->CompleteOnOriginThread(this);
}
}
« cc/tiles/tile_manager.cc ('K') | « cc/tiles/tile_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698