| 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 fae334aee97a979dabc5ba5f518c219aa2e3f793..104256aa304b8c17b0fc914052522ec49a6a840d 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
|
| @@ -53,7 +53,8 @@ CSSImageValue::CSSImageValue(const AtomicString& absoluteURL)
|
| CSSImageValue::~CSSImageValue() {}
|
|
|
| StyleImage* CSSImageValue::cacheImage(const Document& document,
|
| - CrossOriginAttributeValue crossOrigin) {
|
| + CrossOriginAttributeValue crossOrigin,
|
| + bool allowImagePlaceholder) {
|
| if (!m_cachedImage) {
|
| if (m_absoluteURL.isEmpty())
|
| reResolveURL(document);
|
| @@ -67,7 +68,9 @@ StyleImage* CSSImageValue::cacheImage(const Document& document,
|
| if (crossOrigin != CrossOriginAttributeNotSet)
|
| request.setCrossOriginAccessControl(document.getSecurityOrigin(),
|
| crossOrigin);
|
| - if (document.settings() && document.settings()->getFetchImagePlaceholders())
|
| + if (document.settings() &&
|
| + document.settings()->getFetchImagePlaceholders() &&
|
| + allowImagePlaceholder)
|
| request.setAllowImagePlaceholder();
|
|
|
| if (ImageResourceContent* cachedImage =
|
|
|