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

Unified Diff: cc/resources/tile_task_worker_pool_unittest.cc

Issue 817653003: Update from https://crrev.com/309717 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « cc/resources/tile_manager_unittest.cc ('k') | cc/resources/transform_display_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_task_worker_pool_unittest.cc
diff --git a/cc/resources/tile_task_worker_pool_unittest.cc b/cc/resources/tile_task_worker_pool_unittest.cc
index 02ca225ba86c68b7fb851e6c8c97cfaf6f5be6a6..ebb3a8e243641527e6fbb530b143f3e191c087b7 100644
--- a/cc/resources/tile_task_worker_pool_unittest.cc
+++ b/cc/resources/tile_task_worker_pool_unittest.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/cancelable_callback.h"
+#include "cc/base/unique_notifier.h"
#include "cc/resources/bitmap_tile_task_worker_pool.h"
#include "cc/resources/gpu_tile_task_worker_pool.h"
#include "cc/resources/one_copy_tile_task_worker_pool.h"
@@ -125,6 +126,10 @@ class TileTaskWorkerPoolTest
TileTaskWorkerPoolTest()
: context_provider_(TestContextProvider::Create()),
+ all_tile_tasks_finished_(
+ base::MessageLoopProxy::current().get(),
+ base::Bind(&TileTaskWorkerPoolTest::AllTileTasksFinished,
+ base::Unretained(this))),
timeout_seconds_(5),
timed_out_(false) {}
@@ -176,13 +181,17 @@ class TileTaskWorkerPoolTest
tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
}
+ void AllTileTasksFinished() {
+ tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
+ base::MessageLoop::current()->Quit();
+ }
+
// Overriden from TileTaskWorkerPoolClient:
void DidFinishRunningTileTasks(TaskSet task_set) override {
- if (task_set == ALL) {
- tile_task_worker_pool_->AsTileTaskRunner()->CheckForCompletedTasks();
- base::MessageLoop::current()->Quit();
- }
+ if (task_set == ALL)
+ all_tile_tasks_finished_.Schedule();
}
+
TaskSetCollection TasksThatShouldBeForcedToComplete() const override {
return TaskSetCollection();
}
@@ -297,6 +306,7 @@ class TileTaskWorkerPoolTest
TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
TestSharedBitmapManager shared_bitmap_manager_;
base::CancelableClosure timeout_;
+ UniqueNotifier all_tile_tasks_finished_;
int timeout_seconds_;
bool timed_out_;
RasterTaskVector tasks_;
« no previous file with comments | « cc/resources/tile_manager_unittest.cc ('k') | cc/resources/transform_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698