| 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 d4f25b595a2087f97f2e0247a94283e2d2539743..48efe30e8c6bbffefc0fcdb8a297193dd0e9ad49 100644
|
| --- a/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
|
| @@ -313,10 +313,10 @@ void ImageResourceContent::NotifyObservers(
|
| }
|
| }
|
|
|
| -PassRefPtr<Image> ImageResourceContent::CreateImage() {
|
| +PassRefPtr<Image> ImageResourceContent::CreateImage(bool is_multipart) {
|
| if (info_->GetResponse().MimeType() == "image/svg+xml")
|
| - return SVGImage::Create(this);
|
| - return BitmapImage::Create(this);
|
| + return SVGImage::Create(this, is_multipart);
|
| + return BitmapImage::Create(this, is_multipart);
|
| }
|
|
|
| void ImageResourceContent::ClearImage() {
|
| @@ -419,7 +419,8 @@ ImageResourceContent::UpdateImageResult ImageResourceContent::UpdateImage(
|
| PassRefPtr<SharedBuffer> data,
|
| ResourceStatus status,
|
| UpdateImageOption update_image_option,
|
| - bool all_data_received) {
|
| + bool all_data_received,
|
| + bool is_multipart) {
|
| TRACE_EVENT0("blink", "ImageResourceContent::updateImage");
|
|
|
| #if DCHECK_IS_ON()
|
| @@ -452,7 +453,7 @@ ImageResourceContent::UpdateImageResult ImageResourceContent::UpdateImage(
|
| // or specific image frames).
|
| if (data) {
|
| if (!image_)
|
| - image_ = CreateImage();
|
| + image_ = CreateImage(is_multipart);
|
| DCHECK(image_);
|
| size_available_ = image_->SetData(std::move(data), all_data_received);
|
| DCHECK(all_data_received ||
|
|
|