| 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 54d655e690a2004bf081ac599c881d1da6b7d006..294b69c3c98203e3349103f5f335689f57f745c1 100644
|
| --- a/cc/tiles/software_image_decode_controller.h
|
| +++ b/cc/tiles/software_image_decode_controller.h
|
| @@ -103,7 +103,7 @@ class CC_EXPORT SoftwareImageDecodeController : public ImageDecodeController {
|
| // ImageDecodeController overrides.
|
| bool GetTaskForImageAndRef(const DrawImage& image,
|
| uint64_t prepare_tiles_id,
|
| - scoped_refptr<ImageDecodeTask>* task) override;
|
| + scoped_refptr<DependencyTask>* task) override;
|
| void UnrefImage(const DrawImage& image) override;
|
| DecodedDrawImage GetDecodedImageForDraw(const DrawImage& image) override;
|
| void DrawWithImageFinished(const DrawImage& image,
|
| @@ -197,7 +197,7 @@ class CC_EXPORT SoftwareImageDecodeController : public ImageDecodeController {
|
| // more of them.
|
| bool CanHandleImage(const ImageKey& key);
|
|
|
| - std::unordered_map<ImageKey, scoped_refptr<ImageDecodeTask>, ImageKeyHash>
|
| + std::unordered_map<ImageKey, scoped_refptr<DependencyTask>, ImageKeyHash>
|
| pending_image_tasks_;
|
|
|
| // The members below this comment can only be accessed if the lock is held to
|
|
|