cc: Merge TileTaskRunner to TileTaskWorkerPool.

cc/tiles/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 1809 matching lines @@
           EXPECT_EQ(HIGH_RESOLUTION, resolutions[i]);
           // Since it's high res, the bitmap (blue) was drawn, and the
           // background is not visible.
           ASSERT_EQ(SK_ColorBLUE, bitmap->getColor(x, y));
         }
       }
     }
   }
 }
 
-// Fake TileTaskRunner that just no-ops all calls.
-class FakeTileTaskRunner : public TileTaskRunner, public RasterBufferProvider {
+// Fake TileTaskWorkerPool that just no-ops all calls.
+class FakeTileTaskWorkerPool : public TileTaskWorkerPool,
+                               public RasterBufferProvider {
  public:
-  FakeTileTaskRunner() {}
-  ~FakeTileTaskRunner() override {}
+  FakeTileTaskWorkerPool() {}
+  ~FakeTileTaskWorkerPool() override {}
 
-  // TileTaskRunner methods.
+  // TileTaskWorkerPool methods.
   void Shutdown() override {}
   void CheckForCompletedTasks() override {}
   ResourceFormat GetResourceFormat(bool must_support_alpha) const override {
     return ResourceFormat::RGBA_8888;
   }
   bool GetResourceRequiresSwizzle(bool must_support_alpha) const override {
     return false;
   }
   RasterBufferProvider* AsRasterBufferProvider() override { return this; }
 
   void ScheduleTasks(TaskGraph* graph) override {}
 
   // RasterBufferProvider methods.
   std::unique_ptr<RasterBuffer> AcquireBufferForRaster(
       const Resource* resource,
       uint64_t resource_content_id,
       uint64_t previous_content_id) override {
     NOTREACHED();
     return nullptr;
   }
   void ReleaseBufferForRaster(std::unique_ptr<RasterBuffer> buffer) override {}
 };
 
-// Fake TileTaskRunner that just cancels all scheduled tasks immediately.
-class CancellingTileTaskRunner : public FakeTileTaskRunner {
+// Fake TileTaskWorkerPool that just cancels all scheduled tasks immediately.
+class CancellingTileTaskWorkerPool : public FakeTileTaskWorkerPool {
  public:
-  CancellingTileTaskRunner() {}
-  ~CancellingTileTaskRunner() override {}
+  CancellingTileTaskWorkerPool() {}
+  ~CancellingTileTaskWorkerPool() override {}
 
   void ScheduleTasks(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& node : graph->nodes) {
       static_cast<TileTask*>(node.task)->CompleteOnOriginThread(this);
     }
   }
 };
 
 class PartialRasterTileManagerTest : public TileManagerTest {
  public:
   void CustomizeSettings(LayerTreeSettings* settings) override {
     settings->use_partial_raster = true;
   }
 };
 
 // Ensures that if a raster task is cancelled, it gets returned to the resource
 // pool with an invalid content ID, not with its invalidated content ID.
 TEST_F(PartialRasterTileManagerTest, CancelledTasksHaveNoContentId) {
   // Create a CancellingTaskRunner and set it on the tile manager so that all
   // scheduled work is immediately cancelled.
-  CancellingTileTaskRunner cancelling_runner;
-  host_impl_->tile_manager()->SetTileTaskRunnerForTesting(&cancelling_runner);
+  CancellingTileTaskWorkerPool cancelling_worker_pool;
+  host_impl_->tile_manager()->SetTileTaskWorkerPoolForTesting(
+      &cancelling_worker_pool);
 
   // Pick arbitrary IDs - they don't really matter as long as they're constant.
   const int kLayerId = 7;
   const uint64_t kInvalidatedId = 43;
   const gfx::Size kTileSize(128, 128);
 
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(kTileSize);
   host_impl_->CreatePendingTree();
   LayerTreeImpl* pending_tree = host_impl_->pending_tree();
@@ skipping 12 matching lines @@
   // Add tilings/tiles for the layer.
   host_impl_->pending_tree()->BuildPropertyTreesForTesting();
   host_impl_->pending_tree()->UpdateDrawProperties(false /* update_lcd_text */);
 
   // Build the raster queue and invalidate the top tile.
   std::unique_ptr<RasterTilePriorityQueue> queue(host_impl_->BuildRasterQueue(
       SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
   EXPECT_FALSE(queue->IsEmpty());
   queue->Top().tile()->SetInvalidated(gfx::Rect(), kInvalidatedId);
 
-  // PrepareTiles to schedule tasks. Due to the CancellingTileTaskRunner, these
+  // PrepareTiles to schedule tasks. Due to the CancellingTileTaskWorkerPool,
+  // these
   // tasks will immediately be canceled.
   host_impl_->tile_manager()->PrepareTiles(host_impl_->global_tile_state());
 
   // Make sure that the tile we invalidated above was not returned to the pool
   // with its invalidated resource ID.
   host_impl_->resource_pool()->CheckBusyResources();
   EXPECT_FALSE(host_impl_->resource_pool()->TryAcquireResourceWithContentId(
       kInvalidatedId));
 
-  // Free our host_impl_ before the cancelling_runner we passed it, as it will
+  // Free our host_impl_ before the cancelling_worker_pool we passed it, as it
+  // will
   // use that class in clean up.
   host_impl_ = nullptr;
 }
 
-// Fake TileTaskRunner that verifies the resource content ID of raster tasks.
-class VerifyResourceContentIdTileTaskRunner : public FakeTileTaskRunner {
+// Fake TileTaskWorkerPool that verifies the resource content ID of raster
+// tasks.
+class VerifyResourceContentIdTileTaskWorkerPool
+    : public FakeTileTaskWorkerPool {
  public:
-  explicit VerifyResourceContentIdTileTaskRunner(uint64_t expected_resource_id)
+  explicit VerifyResourceContentIdTileTaskWorkerPool(
+      uint64_t expected_resource_id)
       : expected_resource_id_(expected_resource_id) {}
-  ~VerifyResourceContentIdTileTaskRunner() override {}
+  ~VerifyResourceContentIdTileTaskWorkerPool() override {}
 
   void ScheduleTasks(TaskGraph* graph) override {
     for (const auto& node : graph->nodes) {
       TileTask* task = static_cast<TileTask*>(node.task);
       // Triggers a call to AcquireBufferForRaster.
       task->ScheduleOnOriginThread(this);
       // Calls TileManager as though task was cancelled.
       task->CompleteOnOriginThread(this);
     }
   }
@@ skipping 15 matching lines @@
 // depending on |partial_raster_enabled|'s value. Takes ownership of host_impl
 // so that cleanup order can be controlled.
 void RunPartialRasterCheck(std::unique_ptr<LayerTreeHostImpl> host_impl,
                            bool partial_raster_enabled) {
   // Pick arbitrary IDs - they don't really matter as long as they're constant.
   const int kLayerId = 7;
   const uint64_t kInvalidatedId = 43;
   const uint64_t kExpectedId = partial_raster_enabled ? kInvalidatedId : 0u;
   const gfx::Size kTileSize(128, 128);
 
-  // Create a VerifyResourceContentIdTileTaskRunner to ensure that the raster
+  // Create a VerifyResourceContentIdTileTaskWorkerPool to ensure that the
+  // raster
   // task we see is created with |kExpectedId|.
-  VerifyResourceContentIdTileTaskRunner verifying_runner(kExpectedId);
-  host_impl->tile_manager()->SetTileTaskRunnerForTesting(&verifying_runner);
+  VerifyResourceContentIdTileTaskWorkerPool verifying_worker_pool(kExpectedId);
+  host_impl->tile_manager()->SetTileTaskWorkerPoolForTesting(
+      &verifying_worker_pool);
 
   // Ensure there's a resource with our |kInvalidatedId| in the resource pool.
   host_impl->resource_pool()->ReleaseResource(
       host_impl->resource_pool()->AcquireResource(kTileSize, RGBA_8888),
       kInvalidatedId);
   host_impl->resource_pool()->CheckBusyResources();
 
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(kTileSize);
   host_impl->CreatePendingTree();
@@ skipping 14 matching lines @@
   host_impl->pending_tree()->BuildPropertyTreesForTesting();
   host_impl->pending_tree()->UpdateDrawProperties(false /* update_lcd_text */);
 
   // Build the raster queue and invalidate the top tile.
   std::unique_ptr<RasterTilePriorityQueue> queue(host_impl->BuildRasterQueue(
       SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
   EXPECT_FALSE(queue->IsEmpty());
   queue->Top().tile()->SetInvalidated(gfx::Rect(), kInvalidatedId);
 
   // PrepareTiles to schedule tasks. Due to the
-  // VerifyPreviousContentTileTaskRunner, these tasks will verified and
+  // VerifyPreviousContentTileTaskWorkerPool, these tasks will verified and
   // cancelled.
   host_impl->tile_manager()->PrepareTiles(host_impl->global_tile_state());
 
-  // Free our host_impl before the cancelling_runner we passed it, as it will
+  // Free our host_impl before the cancelling_worker_pool we passed it, as it
+  // will
   // use that class in clean up.
   host_impl = nullptr;
 }
 
 // Ensures that the tile manager successfully reuses tiles when partial
 // raster is enabled.
 TEST_F(PartialRasterTileManagerTest, PartialRasterSuccessfullyEnabled) {
   RunPartialRasterCheck(std::move(host_impl_),
                         true /* partial_raster_enabled */);
 }
 
 // Ensures that the tile manager does not attempt to reuse tiles when partial
 // raster is disabled.
 TEST_F(TileManagerTest, PartialRasterSuccessfullyDisabled) {
   RunPartialRasterCheck(std::move(host_impl_),
                         false /* partial_raster_enabled */);
 }
 
 }  // namespace
 }  // namespace cc