| Index: cc/tiles/software_image_decode_controller.h
|
| diff --git a/cc/tiles/software_image_decode_controller.h b/cc/tiles/software_image_decode_controller.h
|
| index 9697720fb3dcec73d1accc7db5ef0ab02eb29fe3..8f6ed0d60e0a7fcd641803dca5ed51710317a131 100644
|
| --- a/cc/tiles/software_image_decode_controller.h
|
| +++ b/cc/tiles/software_image_decode_controller.h
|
| @@ -110,7 +110,7 @@ class CC_EXPORT SoftwareImageDecodeController
|
| // ImageDecodeController overrides.
|
| bool GetTaskForImageAndRef(const DrawImage& image,
|
| uint64_t prepare_tiles_id,
|
| - scoped_refptr<ImageDecodeTask>* task) override;
|
| + scoped_refptr<TileTask>* task) override;
|
| void UnrefImage(const DrawImage& image) override;
|
| DecodedDrawImage GetDecodedImageForDraw(const DrawImage& image) override;
|
| void DrawWithImageFinished(const DrawImage& image,
|
| @@ -241,7 +241,7 @@ class CC_EXPORT SoftwareImageDecodeController
|
| const char* cache_name,
|
| base::trace_event::ProcessMemoryDump* pmd) const;
|
|
|
| - std::unordered_map<ImageKey, scoped_refptr<ImageDecodeTask>, ImageKeyHash>
|
| + std::unordered_map<ImageKey, scoped_refptr<TileTask>, ImageKeyHash>
|
| pending_image_tasks_;
|
|
|
| // The members below this comment can only be accessed if the lock is held to
|
|
|