cc: Refactor TileTaskWorkerPool.

cc/raster/bitmap_raster_buffer_provider.cc

 // Copyright 2014 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 "cc/raster/bitmap_tile_task_worker_pool.h"
+#include "cc/raster/bitmap_raster_buffer_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 27 matching lines @@
       float scale,
       const RasterSource::PlaybackSettings& playback_settings) override {
     gfx::Rect playback_rect = raster_full_rect;
     if (resource_has_previous_content_) {
       playback_rect.Intersect(raster_dirty_rect);
     }
     DCHECK(!playback_rect.IsEmpty())
         << "Why are we rastering a tile that's not dirty?";
 
     size_t stride = 0u;
-    TileTaskWorkerPool::PlaybackToMemory(
+    RasterBufferProvider::PlaybackToMemory(
         lock_.sk_bitmap().getPixels(), resource_->format(), resource_->size(),
         stride, raster_source, raster_full_rect, playback_rect, scale,
         playback_settings);
   }
 
  private:
   ResourceProvider::ScopedWriteLockSoftware lock_;
   const Resource* resource_;
   bool resource_has_previous_content_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
 }  // namespace
 
 // static
-std::unique_ptr<TileTaskWorkerPool> BitmapTileTaskWorkerPool::Create(
-    base::SequencedTaskRunner* task_runner,
-    TaskGraphRunner* task_graph_runner,
+std::unique_ptr<RasterBufferProvider> BitmapRasterBufferProvider::Create(
     ResourceProvider* resource_provider) {
-  return base::WrapUnique<TileTaskWorkerPool>(new BitmapTileTaskWorkerPool(
-      task_runner, task_graph_runner, resource_provider));
+  return base::WrapUnique<RasterBufferProvider>(
+      new BitmapRasterBufferProvider(resource_provider));
 }
 
-BitmapTileTaskWorkerPool::BitmapTileTaskWorkerPool(
-    base::SequencedTaskRunner* task_runner,
-    TaskGraphRunner* task_graph_runner,
+BitmapRasterBufferProvider::BitmapRasterBufferProvider(
     ResourceProvider* resource_provider)
-    : task_runner_(task_runner),
-      task_graph_runner_(task_graph_runner),
-      namespace_token_(task_graph_runner->GetNamespaceToken()),
-      resource_provider_(resource_provider) {}
+    : resource_provider_(resource_provider) {}
 
-BitmapTileTaskWorkerPool::~BitmapTileTaskWorkerPool() {
-}
+BitmapRasterBufferProvider::~BitmapRasterBufferProvider() {}
 
-void BitmapTileTaskWorkerPool::Shutdown() {
-  TRACE_EVENT0("cc", "BitmapTileTaskWorkerPool::Shutdown");
-
-  TaskGraph empty;
-  task_graph_runner_->ScheduleTasks(namespace_token_, &empty);
-  task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
-}
-
-void BitmapTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
-  TRACE_EVENT0("cc", "BitmapTileTaskWorkerPool::ScheduleTasks");
-
-  ScheduleTasksOnOriginThread(this, graph);
-  task_graph_runner_->ScheduleTasks(namespace_token_, graph);
-}
-
-void BitmapTileTaskWorkerPool::CheckForCompletedTasks() {
-  TRACE_EVENT0("cc", "BitmapTileTaskWorkerPool::CheckForCompletedTasks");
-
-  task_graph_runner_->CollectCompletedTasks(namespace_token_,
-                                            &completed_tasks_);
-  for (Task::Vector::const_iterator it = completed_tasks_.begin();
-       it != completed_tasks_.end(); ++it) {
-    TileTask* task = static_cast<TileTask*>(it->get());
-
-    task->WillComplete();
-    task->CompleteOnOriginThread(this);
-    task->DidComplete();
-  }
-  completed_tasks_.clear();
-}
-
-ResourceFormat BitmapTileTaskWorkerPool::GetResourceFormat(
-    bool must_support_alpha) const {
-  return resource_provider_->best_texture_format();
-}
-
-bool BitmapTileTaskWorkerPool::GetResourceRequiresSwizzle(
-    bool must_support_alpha) const {
-  return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
-}
-
-RasterBufferProvider* BitmapTileTaskWorkerPool::AsRasterBufferProvider() {
-  return this;
-}
-
-std::unique_ptr<RasterBuffer> BitmapTileTaskWorkerPool::AcquireBufferForRaster(
+std::unique_ptr<RasterBuffer>
+BitmapRasterBufferProvider::AcquireBufferForRaster(
     const Resource* resource,
     uint64_t resource_content_id,
     uint64_t previous_content_id) {
   return std::unique_ptr<RasterBuffer>(new RasterBufferImpl(
       resource_provider_, resource, resource_content_id, previous_content_id));
 }
 
-void BitmapTileTaskWorkerPool::ReleaseBufferForRaster(
+void BitmapRasterBufferProvider::ReleaseBufferForRaster(
     std::unique_ptr<RasterBuffer> buffer) {
   // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
 }
 
+void BitmapRasterBufferProvider::BarrierToSyncResources() {}

[ericrk, 2016/04/29 07:24:38]

Please add a comment explaining that we do not need to sync resources, as this
provider does not use GL.

+
+ResourceFormat BitmapRasterBufferProvider::GetResourceFormat(
+    bool must_support_alpha) const {
+  return resource_provider_->best_texture_format();
+}
+
+bool BitmapRasterBufferProvider::GetResourceRequiresSwizzle(
+    bool must_support_alpha) const {
+  return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
+}
+
 }  // namespace cc