cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/tiles/gpu_image_decode_controller_unittest.cc

 // Copyright 2016 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/tiles/gpu_image_decode_controller.h"
 
 #include "cc/playback/draw_image.h"
 #include "cc/raster/tile_task.h"
 #include "cc/test/test_context_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 14 matching lines @@
 
   if (!is_decomposable) {
     // Perspective is not decomposable, add it.
     matrix[SkMatrix::kMPersp0] = 0.1f;
   }
 
   return matrix;
 }
 
 void ScheduleTask(TileTask* task) {
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
+  task->state().DidSchedule();
 }
 
+// Before running the task it must be scheduled. Call ScheduleTask() before
+// calling this function.
 void RunTask(TileTask* task) {
-  // TODO(prashant.n): Once ScheduleOnOriginThread() and
-  // CompleteOnOriginThread() functions are removed, modify this function
-  // accordingly. (crbug.com/599863)
-  task->state().DidSchedule();
   task->state().DidStart();
   task->RunOnWorkerThread();
   task->state().DidFinish();
 }
 
-void CompleteTask(TileTask* task) {
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
-  task->DidComplete();
+void CompleteTask(GpuImageDecodeController* controller, TileTask* task) {
+  switch (task->type()) {
+    case TileTask::Type::IMAGE_DECODE:
+      controller->OnImageDecodeTaskCompleted(task);
+      break;
+    case TileTask::Type::IMAGE_UPLOAD:
+      controller->OnImageUploadTaskCompleted(task);
+      break;
+    default:
+      NOTREACHED();
+  }
+
+  task->state().DidComplete();
 }
 
-void ProcessTask(TileTask* task) {
+void CancelTask(TileTask* task) {
+  task->state().DidCancel();
+}
+
+void ProcessTask(GpuImageDecodeController* controller, TileTask* task) {
   ScheduleTask(task);
   RunTask(task);
-  CompleteTask(task);
+  CompleteTask(controller, task);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageSameImage) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   DrawImage another_draw_image(
       image, SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.5f, 1.5f), is_decomposable));
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       another_draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task.get() == another_task.get());
 
-  ProcessTask(task->dependencies()[0].get());
-  ProcessTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  ProcessTask(&controller, task.get());
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageDifferentImage) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
@@ skipping 15 matching lines @@
       second_image,
       SkIRect::MakeWH(second_image->width(), second_image->height()), quality,
       CreateMatrix(SkSize::Make(0.25f, 0.25f), is_decomposable));
   scoped_refptr<TileTask> second_task;
   need_unref = controller.GetTaskForImageAndRef(
       second_draw_image, ImageDecodeController::TracingInfo(), &second_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(second_task);
   EXPECT_TRUE(first_task.get() != second_task.get());
 
-  ProcessTask(first_task->dependencies()[0].get());
-  ProcessTask(first_task.get());
-  ProcessTask(second_task->dependencies()[0].get());
-  ProcessTask(second_task.get());
+  ProcessTask(&controller, first_task->dependencies()[0].get());
+  ProcessTask(&controller, first_task.get());
+  ProcessTask(&controller, second_task->dependencies()[0].get());
+  ProcessTask(&controller, second_task.get());
 
   controller.UnrefImage(first_draw_image);
   controller.UnrefImage(second_draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageAlreadyDecodedAndLocked) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
@@ skipping 10 matching lines @@
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
   EXPECT_EQ(task->dependencies().size(), 1u);
   EXPECT_TRUE(task->dependencies()[0]);
 
   // Run the decode but don't complete it (this will keep the decode locked).
   ScheduleTask(task->dependencies()[0].get());
   RunTask(task->dependencies()[0].get());
 
   // Cancel the upload.
-  ScheduleTask(task.get());
-  CompleteTask(task.get());
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   // Get the image again - we should have an upload task, but no dependent
   // decode task, as the decode was already locked.
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task);
   EXPECT_EQ(another_task->dependencies().size(), 0u);
 
-  ProcessTask(another_task.get());
+  ProcessTask(&controller, another_task.get());
 
   // Finally, complete the original decode task.
-  CompleteTask(task->dependencies()[0].get());
+  CompleteTask(&controller, task->dependencies()[0].get());
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageAlreadyDecodedNotLocked) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
   EXPECT_EQ(task->dependencies().size(), 1u);
   EXPECT_TRUE(task->dependencies()[0]);
 
   // Run the decode.
-  ProcessTask(task->dependencies()[0].get());
+  ProcessTask(&controller, task->dependencies()[0].get());
 
   // Cancel the upload.
-  ScheduleTask(task.get());
-  CompleteTask(task.get());
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   // Unref the image.
   controller.UnrefImage(draw_image);
 
   // Get the image again - we should have an upload task and a dependent decode
   // task - this dependent task will typically just re-lock the image.
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task);
   EXPECT_EQ(another_task->dependencies().size(), 1u);
   EXPECT_TRUE(task->dependencies()[0]);
 
-  ProcessTask(another_task->dependencies()[0].get());
-  ProcessTask(another_task.get());
+  ProcessTask(&controller, another_task->dependencies()[0].get());
+  ProcessTask(&controller, another_task.get());
 
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageAlreadyUploaded) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
   EXPECT_EQ(task->dependencies().size(), 1u);
   EXPECT_TRUE(task->dependencies()[0]);
 
-  ProcessTask(task->dependencies()[0].get());
+  ProcessTask(&controller, task->dependencies()[0].get());
   ScheduleTask(task.get());
   RunTask(task.get());
 
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(another_task);
 
-  CompleteTask(task.get());
+  CompleteTask(&controller, task.get());
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, GetTaskForImageCanceledGetsNewTask) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  ProcessTask(task->dependencies()[0].get());
-  ScheduleTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
 
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
-  // Didn't run the task, complete it (it was canceled).
-  CompleteTask(task.get());
+  // Didn't run the task, so cancel it.
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   // Fully cancel everything (so the raster would unref things).
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 
   // Here a new task is created.
   scoped_refptr<TileTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
 
-  ProcessTask(third_task->dependencies()[0].get());
-  ProcessTask(third_task.get());
+  ProcessTask(&controller, third_task->dependencies()[0].get());
+  ProcessTask(&controller, third_task.get());
 
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest,
      GetTaskForImageCanceledWhileReffedGetsNewTask) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  ProcessTask(task->dependencies()[0].get());
-  ScheduleTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
 
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
-  // Didn't run the task, complete it (it was canceled).
-  CompleteTask(task.get());
+  // Didn't run the task, so cancel it.
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   // Note that here, everything is reffed, but a new task is created. This is
   // possible with repeated schedule/cancel operations.
   scoped_refptr<TileTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
 
-  ProcessTask(third_task->dependencies()[0].get());
-  ProcessTask(third_task.get());
+  ProcessTask(&controller, third_task->dependencies()[0].get());
+  ProcessTask(&controller, third_task.get());
 
   // 3 Unrefs!
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(GpuImageDecodeControllerTest, NoTaskForImageAlreadyFailedDecoding) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  ProcessTask(task->dependencies()[0].get());
-  ScheduleTask(task.get());
-  // Didn't run the task, complete it (it was canceled).
-  CompleteTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  // Didn't run the task, so cancel it.
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   controller.SetImageDecodingFailedForTesting(draw_image);
 
   scoped_refptr<TileTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &another_task);
   EXPECT_FALSE(need_unref);
   EXPECT_EQ(another_task.get(), nullptr);
 
   controller.UnrefImage(draw_image);
@@ skipping 10 matching lines @@
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  ProcessTask(task->dependencies()[0].get());
-  ProcessTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  ProcessTask(&controller, task.get());
 
   // Must hold context lock before calling GetDecodedImageForDraw /
   // DrawWithImageFinished.
   ContextProvider::ScopedContextLock context_lock(context_provider.get());
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_TRUE(decoded_draw_image.image()->isTextureBacked());
   EXPECT_FALSE(decoded_draw_image.is_at_raster_decode());
 
@@ skipping 12 matching lines @@
   sk_sp<SkImage> image = CreateImage(1, 24000);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  ProcessTask(task->dependencies()[0].get());
-  ProcessTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  ProcessTask(&controller, task.get());
 
   // Must hold context lock before calling GetDecodedImageForDraw /
   // DrawWithImageFinished.
   ContextProvider::ScopedContextLock context_lock(context_provider.get());
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_FALSE(decoded_draw_image.image()->isTextureBacked());
   EXPECT_FALSE(decoded_draw_image.is_at_raster_decode());
 
@@ skipping 187 matching lines @@
       image, SkIRect::MakeXYWH(0, 0, image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
   scoped_refptr<TileTask> task;
   bool need_unref = controller.GetTaskForImageAndRef(
       draw_image, ImageDecodeController::TracingInfo(), &task);
   EXPECT_NE(0u, controller.GetBytesUsedForTesting());
   EXPECT_TRUE(task);
   EXPECT_TRUE(need_unref);
 
-  ScheduleTask(task->dependencies()[0].get());
-  CompleteTask(task->dependencies()[0].get());
-  ScheduleTask(task.get());
-  CompleteTask(task.get());
+  CancelTask(task->dependencies()[0].get());
+  CompleteTask(&controller, task->dependencies()[0].get());
+  CancelTask(task.get());
+  CompleteTask(&controller, task.get());
 
   controller.UnrefImage(draw_image);
   EXPECT_EQ(0u, controller.GetBytesUsedForTesting());
 }
 
 TEST(GpuImageDecodeControllerTest, ShouldAggressivelyFreeResources) {
   auto context_provider = TestContextProvider::Create();
   context_provider->BindToCurrentThread();
   GpuImageDecodeController controller(context_provider.get(),
                                       ResourceFormat::RGBA_8888);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   sk_sp<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()),
                        quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<TileTask> task;
   {
     bool need_unref = controller.GetTaskForImageAndRef(
         draw_image, ImageDecodeController::TracingInfo(), &task);
     EXPECT_TRUE(need_unref);
     EXPECT_TRUE(task);
   }
 
-  ProcessTask(task->dependencies()[0].get());
-  ProcessTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  ProcessTask(&controller, task.get());
 
   controller.UnrefImage(draw_image);
 
   // We should now have data image in our cache.
   DCHECK_GT(controller.GetBytesUsedForTesting(), 0u);
 
   // Tell our controller to aggressively free resources.
   controller.SetShouldAggressivelyFreeResources(true);
   DCHECK_EQ(0u, controller.GetBytesUsedForTesting());
 
   // Attempting to upload a new image should result in at-raster decode.
   {
     bool need_unref = controller.GetTaskForImageAndRef(
         draw_image, ImageDecodeController::TracingInfo(), &task);
     EXPECT_FALSE(need_unref);
     EXPECT_FALSE(task);
   }
 
   // We now tell the controller to not aggressively free resources. Uploads
   // should work again.
   controller.SetShouldAggressivelyFreeResources(false);
   {
     bool need_unref = controller.GetTaskForImageAndRef(
         draw_image, ImageDecodeController::TracingInfo(), &task);
     EXPECT_TRUE(need_unref);
     EXPECT_TRUE(task);
   }
 
-  ProcessTask(task->dependencies()[0].get());
-  ProcessTask(task.get());
+  ProcessTask(&controller, task->dependencies()[0].get());
+  ProcessTask(&controller, task.get());
 
   // The image should be in our cache after un-ref.
   controller.UnrefImage(draw_image);
   DCHECK_GT(controller.GetBytesUsedForTesting(), 0u);
 }
 
 }  // namespace
 }  // namespace cc