| 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 565dc731ca01b008f9e4a150ed3134150d6c9933..08fe561adff445c14d15d9de51d490b453e1f4cc 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| @@ -101,6 +101,7 @@ StyleImage* CSSImageSetValue::CachedImage(float device_scale_factor) const {
|
| StyleImage* CSSImageSetValue::CacheImage(
|
| const Document& document,
|
| float device_scale_factor,
|
| + FetchParameters::PlaceholderImageRequestType placeholder_image_request_type,
|
| CrossOriginAttributeValue cross_origin) {
|
| if (!images_in_set_.size())
|
| FillImageSet();
|
| @@ -122,7 +123,8 @@ StyleImage* CSSImageSetValue::CacheImage(
|
| cross_origin);
|
| }
|
|
|
| - if (document.GetFrame())
|
| + if (document.GetFrame() &&
|
| + placeholder_image_request_type == FetchParameters::kAllowPlaceholder)
|
| document.GetFrame()->MaybeAllowImagePlaceholder(params);
|
|
|
| if (ImageResourceContent* cached_image =
|
|
|