Chromium Code Reviews| 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 10127663d8855e72b8396f52a452fd4df0629f19..c4586b0d8a162e63079bbf7bef93f8940f15a3df 100644 |
| --- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp |
| +++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp |
| @@ -23,6 +23,7 @@ |
| #include "core/css/CSSMarkup.h" |
| #include "core/dom/Document.h" |
| #include "core/frame/LocalFrame.h" |
| +#include "core/frame/Settings.h" |
|
sclittle
2017/06/21 20:46:56
nit: remove unused include
|
| #include "core/loader/resource/ImageResourceContent.h" |
| #include "core/style/StyleFetchedImage.h" |
| #include "core/style/StyleInvalidImage.h" |
| @@ -53,8 +54,10 @@ CSSImageValue::CSSImageValue(const AtomicString& absolute_url) |
| CSSImageValue::~CSSImageValue() {} |
| -StyleImage* CSSImageValue::CacheImage(const Document& document, |
| - CrossOriginAttributeValue cross_origin) { |
| +StyleImage* CSSImageValue::CacheImage( |
| + const Document& document, |
| + FetchParameters::PlaceholderImageRequestType placeholder_image_request_type, |
| + CrossOriginAttributeValue cross_origin) { |
| if (!cached_image_) { |
| if (absolute_url_.IsEmpty()) |
| ReResolveURL(document); |
| @@ -72,7 +75,8 @@ StyleImage* CSSImageValue::CacheImage(const Document& document, |
| params.SetCrossOriginAccessControl(document.GetSecurityOrigin(), |
| cross_origin); |
| } |
| - if (document.GetFrame()) |
| + if (document.GetFrame() && |
| + placeholder_image_request_type == FetchParameters::kAllowPlaceholder) |
| document.GetFrame()->MaybeAllowImagePlaceholder(params); |
| if (ImageResourceContent* cached_image = |