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

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

Issue 2710113002: DO NOT SUBMIT really old prototype of sprite recognition for image replacement
Patch Set: Created 3 years, 10 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/CSSImageValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSImageValue.cpp b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
index c5cfd45d6d2a75e42f7e35a6e23fae10d6c4ddda..4e8d0a23ca54c07658f7de922a66915c6c9a7142 100644
--- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
@@ -26,6 +26,7 @@
#include "core/fetch/FetchRequest.h"
#include "core/fetch/ImageResource.h"
#include "core/fetch/ResourceFetcher.h"
+#include "core/frame/Settings.h"
#include "core/loader/MixedContentChecker.h"
#include "core/style/StyleFetchedImage.h"
#include "core/style/StyleInvalidImage.h"
@@ -54,7 +55,7 @@ CSSImageValue::~CSSImageValue()
{
}
-StyleImage* CSSImageValue::cacheImage(const Document& document, CrossOriginAttributeValue crossOrigin)
+StyleImage* CSSImageValue::cacheImage(const Document& document, CrossOriginAttributeValue crossOrigin, ImageResource::PlaceholderRequestType placeholderRequestType)
{
if (!m_cachedImage) {
FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName);
@@ -63,7 +64,7 @@ StyleImage* CSSImageValue::cacheImage(const Document& document, CrossOriginAttri
if (crossOrigin != CrossOriginAttributeNotSet)
request.setCrossOriginAccessControl(document.getSecurityOrigin(), crossOrigin);
- if (ImageResource* cachedImage = ImageResource::fetch(request, document.fetcher()))
+ if (ImageResource* cachedImage = ImageResource::fetch(request, document.fetcher(), placeholderRequestType))
m_cachedImage = StyleFetchedImage::create(cachedImage, document, request.url());
else
m_cachedImage = StyleInvalidImage::create(url());

Powered by Google App Engine
This is Rietveld 408576698