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

Unified Diff: cc/test/fake_tile_manager.cc

Issue 165603002: cc: Move GPU raster to DirectRasterWorkerPool. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« cc/resources/tile_manager.cc ('K') | « cc/test/fake_tile_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_tile_manager.cc
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
index 1d6ecd81ccb241c7546aad2bcab0e772abeedef7..2adfcdd6c935254a4e9026fae3703907422836e5 100644
--- a/cc/test/fake_tile_manager.cc
+++ b/cc/test/fake_tile_manager.cc
@@ -13,20 +13,12 @@ namespace cc {
namespace {
-class FakeTaskGraphRunner : public internal::TaskGraphRunner {
- public:
- FakeTaskGraphRunner() : internal::TaskGraphRunner(0, "CompositorRaster") {}
-};
-base::LazyInstance<FakeTaskGraphRunner> g_task_graph_runner =
- LAZY_INSTANCE_INITIALIZER;
-
class FakeRasterWorkerPool : public RasterWorkerPool {
public:
- FakeRasterWorkerPool()
- : RasterWorkerPool(g_task_graph_runner.Pointer(), NULL, NULL) {}
+ FakeRasterWorkerPool() : RasterWorkerPool(NULL, NULL) {}
// Overridden from RasterWorkerPool:
- virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
+ virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE {
for (RasterTaskQueueIterator it(queue); it; ++it) {
internal::RasterWorkerPoolTask* task = *it;
@@ -36,9 +28,6 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
}
}
virtual void CheckForCompletedTasks() OVERRIDE {
- internal::Task::Vector completed_tasks;
- CollectCompletedWorkerPoolTasks(&completed_tasks);
-
while (!completed_tasks_.empty()) {
internal::WorkerPoolTask* task = completed_tasks_.front().get();
@@ -80,6 +69,8 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
FakeTileManager::FakeTileManager(TileManagerClient* client)
: TileManager(client,
NULL,
+ NULL,
+ make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
std::numeric_limits<unsigned>::max(),
NULL,
@@ -89,6 +80,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
ResourceProvider* resource_provider)
: TileManager(client,
resource_provider,
+ NULL,
+ make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
std::numeric_limits<unsigned>::max(),
NULL,
@@ -99,6 +92,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
bool allow_on_demand_raster)
: TileManager(client,
resource_provider,
+ NULL,
+ make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
std::numeric_limits<unsigned>::max(),
NULL,
@@ -109,6 +104,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
size_t raster_task_limit_bytes)
: TileManager(client,
resource_provider,
+ NULL,
+ make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
raster_task_limit_bytes,
NULL,
@@ -132,10 +129,6 @@ bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
tile) != tiles_for_raster.end();
}
-void FakeTileManager::CheckForCompletedTasks() {
- RasterWorkerPoolForTesting()->CheckForCompletedTasks();
-}
-
void FakeTileManager::DidFinishRunningTasksForTesting() {
DidFinishRunningTasks();
}
« cc/resources/tile_manager.cc ('K') | « cc/test/fake_tile_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698