cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/tiles/software_image_decode_controller.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 <stdint.h>
 
 #include <functional>
 
@@ skipping 44 matching lines @@
                      SoftwareImageDecodeController::ImageKeyHash>* task_map_;
   SoftwareImageDecodeController::ImageKey key_;
 };
 
 class ImageDecodeTaskImpl : public TileTask {
  public:
   ImageDecodeTaskImpl(SoftwareImageDecodeController* controller,
                       const SoftwareImageDecodeController::ImageKey& image_key,
                       const DrawImage& image,
                       const ImageDecodeController::TracingInfo& tracing_info)
-      : TileTask(true),
+      : TileTask(TileTask::Type::IMAGE_DECODE, true),
         controller_(controller),
         image_key_(image_key),
         image_(image),
         tracing_info_(tracing_info) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
     TRACE_EVENT2("cc", "ImageDecodeTaskImpl::RunOnWorkerThread", "mode",
                  "software", "source_prepare_tiles_id",
                  tracing_info_.prepare_tiles_id);
     devtools_instrumentation::ScopedImageDecodeTask image_decode_task(
         image_.image().get());
     controller_->DecodeImage(image_key_, image_);
   }
 
-  // Overridden from TileTask:
-  void ScheduleOnOriginThread(RasterBufferProvider* provider) override {}
-  void CompleteOnOriginThread(RasterBufferProvider* provider) override {
-    controller_->RemovePendingTask(image_key_);
-  }
-
  protected:
   ~ImageDecodeTaskImpl() override {}
 
- private:
+ public:

[vmpstr, 2016/05/18 19:08:34]

Why are these public? This doesn't look correct.

[prashant.n, 2016/05/19 00:59:52]

Yes. This looks odd and not good as this class is under unamed nmaespace, we
cannot add friend for it.

I'll check another way suggested by reveman@, having completed function in task
itself.

   SoftwareImageDecodeController* controller_;
   SoftwareImageDecodeController::ImageKey image_key_;
   DrawImage image_;
   const ImageDecodeController::TracingInfo tracing_info_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ImageDecodeTaskImpl);
 };
 
 SkSize GetScaleAdjustment(const ImageDecodeControllerKey& key) {
   // If the requested filter quality did not require scale, then the adjustment
   // is identity.
   if (key.can_use_original_decode())
     return SkSize::Make(1.f, 1.f);
 
   float x_scale =
@@ skipping 610 matching lines @@
     if (it->second->is_locked()) {
       ++it;
       continue;
     }
 
     it = decoded_images_.Erase(it);
     --num_to_remove;
   }
 }
 
+void SoftwareImageDecodeController::OnImageDecodeTaskCompleted(TileTask* task) {
+  ImageDecodeTaskImpl* decode_task = static_cast<ImageDecodeTaskImpl*>(task);

[vmpstr, 2016/05/18 19:08:34]

I think we should rework this so we don't need a static cast somehow. Maybe
double dispatch

[prashant.n, 2016/05/19 00:59:52]

I'll check this. static cast was added for downcasting.

+  DCHECK(decode_task);
+  RemovePendingTask(decode_task->image_key_);
+}
+
 void SoftwareImageDecodeController::RemovePendingTask(const ImageKey& key) {
   base::AutoLock lock(lock_);
   pending_image_tasks_.erase(key);
 }
 
 bool SoftwareImageDecodeController::OnMemoryDump(
     const base::trace_event::MemoryDumpArgs& args,
     base::trace_event::ProcessMemoryDump* pmd) {
   base::AutoLock lock(lock_);
 
@@ skipping 225 matching lines @@
 void SoftwareImageDecodeController::MemoryBudget::ResetUsage() {
   current_usage_bytes_ = 0;
 }
 
 size_t SoftwareImageDecodeController::MemoryBudget::GetCurrentUsageSafe()
     const {
   return current_usage_bytes_.ValueOrDie();
 }
 
 }  // namespace cc