cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/tiles/gpu_image_decode_controller.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 "base/memory/discardable_memory_allocator.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/stringprintf.h"
@@ skipping 58 matching lines @@
   }
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     TRACE_EVENT2("cc", "ImageDecodeTaskImpl::RunOnWorkerThread", "mode", "gpu",
                  "source_prepare_tiles_id", tracing_info_.prepare_tiles_id);
     controller_->DecodeImage(image_);
   }
 
   // Overridden from TileTask:
-  void ScheduleOnOriginThread(RasterBufferProvider* provider) override {}
-  void CompleteOnOriginThread(RasterBufferProvider* provider) override {
-    controller_->DecodeTaskCompleted(image_);
+  void OnTaskCompleted() override {
+    controller_->OnImageDecodeTaskCompleted(image_);
   }
 
  protected:
   ~ImageDecodeTaskImpl() override {}
 
  private:
   GpuImageDecodeController* controller_;
   DrawImage image_;
   const ImageDecodeController::TracingInfo tracing_info_;
 
@@ skipping 20 matching lines @@
       dependencies_.push_back(std::move(decode_dependency));
   }
 
   // Override from Task:
   void RunOnWorkerThread() override {
     TRACE_EVENT2("cc", "ImageUploadTaskImpl::RunOnWorkerThread", "mode", "gpu",
                  "source_prepare_tiles_id", tracing_info_.prepare_tiles_id);
     controller_->UploadImage(image_);
   }
 
-  void ScheduleOnOriginThread(RasterBufferProvider* provider) override {}
-  void CompleteOnOriginThread(RasterBufferProvider* provider) override {
-    controller_->UploadTaskCompleted(image_);
+  // Overridden from TileTask:
+  void OnTaskCompleted() override {
+    controller_->OnImageUploadTaskCompleted(image_);
   }
 
  protected:
   ~ImageUploadTaskImpl() override {}
 
  private:
   GpuImageDecodeController* controller_;
   DrawImage image_;
   const ImageDecodeController::TracingInfo tracing_info_;
 
@@ skipping 301 matching lines @@
 
 void GpuImageDecodeController::UploadImage(const DrawImage& draw_image) {
   ContextProvider::ScopedContextLock context_lock(context_);
   base::AutoLock lock(lock_);
   auto found = image_data_.Peek(draw_image.image()->uniqueID());
   DCHECK(found != image_data_.end());
   DCHECK(!found->second->is_at_raster);
   UploadImageIfNecessary(draw_image, found->second.get());
 }
 
-void GpuImageDecodeController::DecodeTaskCompleted(
+void GpuImageDecodeController::OnImageDecodeTaskCompleted(
     const DrawImage& draw_image) {
   base::AutoLock lock(lock_);
   // Decode task is complete, remove it from our list of pending tasks.
   pending_image_decode_tasks_.erase(draw_image.image()->uniqueID());
 
   // While the decode task is active, we keep a ref on the decoded data.
   // Release that ref now.
   UnrefImageDecode(draw_image);
 }
 
-void GpuImageDecodeController::UploadTaskCompleted(
+void GpuImageDecodeController::OnImageUploadTaskCompleted(
     const DrawImage& draw_image) {
   base::AutoLock lock(lock_);
   // Upload task is complete, remove it from our list of pending tasks.
   pending_image_upload_tasks_.erase(draw_image.image()->uniqueID());
 
   // While the upload task is active, we keep a ref on both the image it will be
   // populating, as well as the decode it needs to populate it. Release these
   // refs now.
   UnrefImageDecode(draw_image);
   UnrefImageInternal(draw_image);
@@ skipping 390 matching lines @@
 bool GpuImageDecodeController::DiscardableIsLockedForTesting(
     const DrawImage& image) {
   base::AutoLock lock(lock_);
   auto found = image_data_.Peek(image.image()->uniqueID());
   DCHECK(found != image_data_.end());
   ImageData* image_data = found->second.get();
   return image_data->decode.is_locked;
 }
 
 }  // namespace cc