Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Unified Diff: third_party/WebKit/Source/core/css/CSSImageSetValue.cpp

Issue 2795173002: Do not show image placeholders for CSS sprites (Closed)
Patch Set: Added layout test expected result Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 =

Powered by Google App Engine
This is Rietveld 408576698