| Index: third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| index a1fdbd14778d3dff499a62718d1cdd1314636808..ddeab1b7376cb021196a7d355ca79879d16bf8c0 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| @@ -101,7 +101,9 @@ StyleImage* CSSImageSetValue::CachedImage(float device_scale_factor) const {
|
| StyleImage* CSSImageSetValue::CacheImage(
|
| const Document& document,
|
| float device_scale_factor,
|
| - CrossOriginAttributeValue cross_origin) {
|
| + CrossOriginAttributeValue cross_origin,
|
| + FetchParameters::PlaceholderImageRequestType
|
| + placeholder_image_request_type) {
|
| if (!images_in_set_.size())
|
| FillImageSet();
|
|
|
| @@ -120,7 +122,8 @@ StyleImage* CSSImageSetValue::CacheImage(
|
| cross_origin);
|
| }
|
| if (document.GetSettings() &&
|
| - document.GetSettings()->GetFetchImagePlaceholders())
|
| + document.GetSettings()->GetFetchImagePlaceholders() &&
|
| + placeholder_image_request_type == FetchParameters::kAllowPlaceholder)
|
| params.SetAllowImagePlaceholder();
|
|
|
| if (ImageResourceContent* cached_image =
|
|
|