Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / test / fake_tile_manager.cc

diff --git a/src/cc/test/fake_tile_manager.cc b/src/cc/test/fake_tile_manager.cc
index d5bc80b..cba9db4 100644 (file)
--- a/src/cc/test/fake_tile_manager.cc
+++ b/src/cc/test/fake_tile_manager.cc
@@ -17,19 +17,24 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
  public:
   FakeRasterWorkerPool() : RasterWorkerPool(NULL, NULL) {}
 
+  // Overridden from RasterWorkerPool:
   virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
-    RasterWorkerPool::SetRasterTasks(queue);
-    for (RasterTaskVector::const_iterator it = raster_tasks().begin();
-         it != raster_tasks().end(); ++it) {
-      completed_tasks_.push_back(it->get());
+    for (RasterTaskQueueIterator it(queue); it; ++it) {
+      internal::RasterWorkerPoolTask* task = *it;
+
+      task->DidSchedule();
+
+      completed_tasks_.push_back(task);
     }
   }
   virtual void CheckForCompletedTasks() OVERRIDE {
     while (!completed_tasks_.empty()) {
-      internal::RasterWorkerPoolTask* task = completed_tasks_.front().get();
+      internal::WorkerPoolTask* task = completed_tasks_.front().get();
+
       task->WillComplete();
-      task->CompleteOnOriginThread();
       task->DidComplete();
+      task->RunReplyOnOriginThread();
+
       completed_tasks_.pop_front();
     }
   }
@@ -39,11 +44,23 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
   virtual ResourceFormat GetResourceFormat() const OVERRIDE {
     return RGBA_8888;
   }
+
+  // Overridden from internal::WorkerPoolTaskClient:
+  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
+      OVERRIDE {
+    return NULL;
+  }
+  virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
+                                 const PicturePileImpl::Analysis& analysis)
+      OVERRIDE {}
+  virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE {
+  }
+
+ private:
+  // Overridden from RasterWorkerPool:
   virtual void OnRasterTasksFinished() OVERRIDE {}
   virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE {}
 
- private:
-  typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> > TaskDeque;
   TaskDeque completed_tasks_;
 };
 
@@ -52,31 +69,49 @@ 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) {}
+                  NULL,
+                  true) {}
 
 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,
+                  true) {}
+
+FakeTileManager::FakeTileManager(TileManagerClient* client,
+                                 ResourceProvider* resource_provider,
+                                 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) {}
+                  NULL,
+                  allow_on_demand_raster) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider,
                                  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) {}
+                  NULL,
+                  true) {}
 
-FakeTileManager::~FakeTileManager() {
-  RasterWorkerPoolForTesting()->Shutdown();
-  RasterWorkerPoolForTesting()->CheckForCompletedTasks();
-}
+FakeTileManager::~FakeTileManager() {}
 
 void FakeTileManager::AssignMemoryToTiles(
     const GlobalStateThatImpactsTilePriority& state) {
@@ -94,8 +129,8 @@ bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
                    tile) != tiles_for_raster.end();
 }
 
-void FakeTileManager::CheckForCompletedTasks() {
-  RasterWorkerPoolForTesting()->CheckForCompletedTasks();
+void FakeTileManager::DidFinishRunningTasksForTesting() {
+  DidFinishRunningTasks();
 }
 
 void FakeTileManager::Release(Tile* tile) {