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 9418805b5404eaad3b9c9777a792015dc5ace894..e9e7d9fede79cefa091d236f9257534fba6b06ee 100644 |
--- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp |
@@ -104,7 +104,7 @@ StyleFetchedImageSet* CSSImageSetValue::cachedImageSet(float deviceScaleFactor) |
return m_cachedImageSet.get(); |
} |
-StyleFetchedImageSet* CSSImageSetValue::cacheImageSet(Document* document, float deviceScaleFactor, const ResourceLoaderOptions& options) |
+StyleFetchedImageSet* CSSImageSetValue::cacheImageSet(Document* document, float deviceScaleFactor, CrossOriginAttributeValue crossOrigin) |
{ |
ASSERT(document); |
@@ -116,11 +116,11 @@ StyleFetchedImageSet* CSSImageSetValue::cacheImageSet(Document* document, float |
// All forms of scale should be included: Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), |
// and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698 |
ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor); |
- FetchRequest request(ResourceRequest(document->completeURL(image.imageURL)), FetchInitiatorTypeNames::css, options); |
+ FetchRequest request(ResourceRequest(document->completeURL(image.imageURL)), FetchInitiatorTypeNames::css); |
request.mutableResourceRequest().setHTTPReferrer(image.referrer); |
- if (options.corsEnabled == IsCORSEnabled) |
- request.setCrossOriginAccessControl(document->securityOrigin(), options.allowCredentials, options.credentialsRequested); |
+ if (crossOrigin != CrossOriginAttributeNotSet) |
+ request.setCrossOriginAccessControl(document->securityOrigin(), crossOrigin); |
if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(request, document->fetcher())) { |
m_cachedImageSet = StyleFetchedImageSet::create(cachedImage.get(), image.scaleFactor, this, request.url()); |
@@ -132,11 +132,6 @@ StyleFetchedImageSet* CSSImageSetValue::cacheImageSet(Document* document, float |
return m_cachedImageSet.get(); |
} |
-StyleFetchedImageSet* CSSImageSetValue::cacheImageSet(Document* document, float deviceScaleFactor) |
-{ |
- return cacheImageSet(document, deviceScaleFactor, ResourceFetcher::defaultResourceOptions()); |
-} |
- |
String CSSImageSetValue::customCSSText() const |
{ |
StringBuilder result; |