| Index: third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| index 34733c5f3e65f6f948ddd21b80ecb68ad276c05b..71758fae61b8a5efc517dc5ae402bc759548e53b 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| @@ -68,18 +68,23 @@ class NullImageResourceInfo final
|
|
|
| } // namespace
|
|
|
| -ImageResourceContent::ImageResourceContent(PassRefPtr<blink::Image> image)
|
| - : image_(std::move(image)), is_refetchable_data_from_disk_cache_(true) {
|
| +ImageResourceContent::ImageResourceContent(RefPtr<WebTaskRunner> task_runner,
|
| + PassRefPtr<blink::Image> image)
|
| + : image_(std::move(image)),
|
| + is_refetchable_data_from_disk_cache_(true),
|
| + task_runner_(task_runner) {
|
| DEFINE_STATIC_LOCAL(NullImageResourceInfo, null_info,
|
| (new NullImageResourceInfo()));
|
| info_ = &null_info;
|
| }
|
|
|
| -ImageResourceContent* ImageResourceContent::Fetch(FetchParameters& params,
|
| - ResourceFetcher* fetcher) {
|
| +ImageResourceContent* ImageResourceContent::Fetch(
|
| + RefPtr<WebTaskRunner> task_runner,
|
| + FetchParameters& params,
|
| + ResourceFetcher* fetcher) {
|
| // TODO(hiroshige): Remove direct references to ImageResource by making
|
| // the dependencies around ImageResource and ImageResourceContent cleaner.
|
| - ImageResource* resource = ImageResource::Fetch(params, fetcher);
|
| + ImageResource* resource = ImageResource::Fetch(task_runner, params, fetcher);
|
| if (!resource)
|
| return nullptr;
|
| return resource->GetContent();
|
| @@ -309,7 +314,7 @@ void ImageResourceContent::NotifyObservers(
|
| PassRefPtr<Image> ImageResourceContent::CreateImage() {
|
| if (info_->GetResponse().MimeType() == "image/svg+xml")
|
| return SVGImage::Create(this);
|
| - return BitmapImage::Create(this);
|
| + return BitmapImage::Create(task_runner_, this);
|
| }
|
|
|
| void ImageResourceContent::ClearImage() {
|
|
|