| Index: third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSImageValue.cpp b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| index be304a481be2bf462db677ed3a1749a2f793a5c5..c4d688a31cdd07784fbabd236504ba849bf70834 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| @@ -52,8 +52,11 @@ CSSImageValue::CSSImageValue(const AtomicString& absolute_url)
|
|
|
| CSSImageValue::~CSSImageValue() {}
|
|
|
| -StyleImage* CSSImageValue::CacheImage(const Document& document,
|
| - CrossOriginAttributeValue cross_origin) {
|
| +StyleImage* CSSImageValue::CacheImage(
|
| + const Document& document,
|
| + CrossOriginAttributeValue cross_origin,
|
| + FetchParameters::PlaceholderImageRequestType
|
| + placeholder_image_request_type) {
|
| if (!cached_image_) {
|
| if (absolute_url_.IsEmpty())
|
| ReResolveURL(document);
|
| @@ -69,7 +72,8 @@ StyleImage* CSSImageValue::CacheImage(const Document& document,
|
| cross_origin);
|
| }
|
| if (document.GetSettings() &&
|
| - document.GetSettings()->GetFetchImagePlaceholders())
|
| + document.GetSettings()->GetFetchImagePlaceholders() &&
|
| + placeholder_image_request_type == FetchParameters::kAllowPlaceholder)
|
| params.SetAllowImagePlaceholder();
|
|
|
| if (ImageResourceContent* cached_image =
|
|
|