| 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 c98064dd2b7b878d84a28c30273521ee64662472..229179af4683dee16c89463ac503d656574f0d57 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
|
| @@ -97,10 +97,10 @@ StyleImage* CSSImageSetValue::cachedImage(float deviceScaleFactor) const {
|
| return m_cachedImage.get();
|
| }
|
|
|
| -StyleImage* CSSImageSetValue::cacheImage(
|
| - const Document& document,
|
| - float deviceScaleFactor,
|
| - CrossOriginAttributeValue crossOrigin) {
|
| +StyleImage* CSSImageSetValue::cacheImage(const Document& document,
|
| + float deviceScaleFactor,
|
| + CrossOriginAttributeValue crossOrigin,
|
| + bool allowImagePlaceholder) {
|
| if (!m_imagesInSet.size())
|
| fillImageSet();
|
|
|
| @@ -117,7 +117,9 @@ StyleImage* CSSImageSetValue::cacheImage(
|
| 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 =
|
|
|