cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/tiles/software_image_decode_controller_unittest.cc

 // Copyright 2015 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/software_image_decode_controller.h"
 
 #include "cc/playback/draw_image.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
@@ skipping 486 matching lines @@
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
   task->RunOnWorkerThread();
 
   scoped_refptr<ImageDecodeTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(another_task);
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageAlreadyPrerolled) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kLow_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
   task->RunOnWorkerThread();
 
   scoped_refptr<ImageDecodeTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(another_task);
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   scoped_refptr<ImageDecodeTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(third_task);
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageCanceledGetsNewTask) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
+  LOG(INFO) << "PRAS1::" << __FUNCTION__;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
-
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
+  LOG(INFO) << "PRAS2::" << __FUNCTION__;
   scoped_refptr<ImageDecodeTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
   // Didn't run the task, complete it (it was canceled).
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
+  task->Release();
 
   // Fully cancel everything (so the raster would unref things).
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
-
+  LOG(INFO) << "PRAS3::" << __FUNCTION__;
   // Here a new task is created.
   scoped_refptr<ImageDecodeTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
 
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetTaskForImageCanceledWhileReffedGetsNewTask) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
   scoped_refptr<ImageDecodeTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
   // Didn't run the task, complete it (it was canceled).
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   // Note that here, everything is reffed, but a new task is created. This is
   // possible with repeated schedule/cancel operations.
   scoped_refptr<ImageDecodeTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
@@ skipping 13 matching lines @@
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
   task->RunOnWorkerThread();
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_EQ(50, decoded_draw_image.image()->width());
   EXPECT_EQ(50, decoded_draw_image.image()->height());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().width());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().height());
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
@@ skipping 14 matching lines @@
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeXYWH(20, 30, image->width(), image->height()),
       quality, CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
   task->RunOnWorkerThread();
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_EQ(40, decoded_draw_image.image()->width());
   EXPECT_EQ(35, decoded_draw_image.image()->height());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().width());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().height());
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
@@ skipping 81 matching lines @@
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_FALSE(decoded_draw_image.is_scale_adjustment_identity());
   EXPECT_TRUE(decoded_draw_image.is_at_raster_decode());
 
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
   task->RunOnWorkerThread();
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   DecodedDrawImage another_decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   // This should get the new decoded/locked image, not the one we're using at
   // raster.
   // TODO(vmpstr): We can possibly optimize this so that the decode simply moves
   // the image to the right spot.
   EXPECT_NE(decoded_draw_image.image()->uniqueID(),
             another_decoded_draw_image.image()->uniqueID());
@@ skipping 26 matching lines @@
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_FALSE(decoded_draw_image.is_scale_adjustment_identity());
   EXPECT_TRUE(decoded_draw_image.is_at_raster_decode());
 
   scoped_refptr<ImageDecodeTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
-  task->WillSchedule();
-  task->ScheduleOnOriginThread(nullptr);
-  task->DidSchedule();
-
   // If we finish the draw here, then we will use it for the locked decode
   // instead of decoding again.
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
 
   task->RunOnWorkerThread();
 
-  task->WillComplete();
-  task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   DecodedDrawImage another_decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   // This should get the decoded/locked image which we originally decoded at
   // raster time, since it's now in the locked cache.
   EXPECT_EQ(decoded_draw_image.image()->uniqueID(),
             another_decoded_draw_image.image()->uniqueID());
   EXPECT_FALSE(another_decoded_draw_image.is_at_raster_decode());
 
@@ skipping 129 matching lines @@
   // SkImage object.
   EXPECT_TRUE(decoded_draw_image.image() != image.get());
   EXPECT_EQ(kNone_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_TRUE(decoded_draw_image.is_scale_adjustment_identity());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 }  // namespace
 }  // namespace cc