| Index: cc/tiles/gpu_image_decode_controller.cc
|
| diff --git a/cc/tiles/gpu_image_decode_controller.cc b/cc/tiles/gpu_image_decode_controller.cc
|
| index b7dbd55f116d1900fca133a64d710abf086376a3..dd30a8f60e553213493d9ba0b549a5e49cfb241b 100644
|
| --- a/cc/tiles/gpu_image_decode_controller.cc
|
| +++ b/cc/tiles/gpu_image_decode_controller.cc
|
| @@ -77,9 +77,8 @@ class ImageDecodeTaskImpl : public TileTask {
|
| }
|
|
|
| // Overridden from TileTask:
|
| - void ScheduleOnOriginThread(RasterBufferProvider* provider) override {}
|
| - void CompleteOnOriginThread(RasterBufferProvider* provider) override {
|
| - controller_->DecodeTaskCompleted(image_);
|
| + void OnTaskCompleted() override {
|
| + controller_->OnImageDecodeTaskCompleted(image_);
|
| }
|
|
|
| protected:
|
| @@ -120,9 +119,9 @@ class ImageUploadTaskImpl : public TileTask {
|
| 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:
|
| @@ -442,7 +441,7 @@ void GpuImageDecodeController::UploadImage(const DrawImage& draw_image) {
|
| 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.
|
| @@ -453,7 +452,7 @@ void GpuImageDecodeController::DecodeTaskCompleted(
|
| 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.
|
|
|