| Index: Source/core/css/CSSImageValue.cpp
|
| diff --git a/Source/core/css/CSSImageValue.cpp b/Source/core/css/CSSImageValue.cpp
|
| index 39a1b6ec84128e1b52682d2ea9cdfdd848cde2ca..f64f1eb25f0a9430319a3c8aa798534fc19f322a 100644
|
| --- a/Source/core/css/CSSImageValue.cpp
|
| +++ b/Source/core/css/CSSImageValue.cpp
|
| @@ -60,19 +60,20 @@ StyleImage* CSSImageValue::cachedOrPendingImage()
|
| return m_image.get();
|
| }
|
|
|
| -StyleFetchedImage* CSSImageValue::cachedImage(ResourceFetcher* loader, const ResourceLoaderOptions& options)
|
| +StyleFetchedImage* CSSImageValue::cachedImage(ResourceFetcher* fetcher, const ResourceLoaderOptions& options, FetchRequest::OriginRestriction originRestriction)
|
| {
|
| - ASSERT(loader);
|
| + ASSERT(fetcher);
|
|
|
| if (!m_accessedImage) {
|
| m_accessedImage = true;
|
|
|
| - FetchRequest request(ResourceRequest(loader->document()->completeURL(m_url)), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
|
| + FetchRequest request(ResourceRequest(fetcher->document()->completeURL(m_url)), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
|
|
|
| - if (options.requestOriginPolicy == PotentiallyCrossOriginEnabled)
|
| - updateRequestForAccessControl(request.mutableResourceRequest(), loader->document()->securityOrigin(), options.allowCredentials);
|
| + request.setOriginRestriction(originRestriction);
|
| + if (originRestriction != FetchRequest::RestrictToSameOrigin)
|
| + updateRequestForAccessControl(request.mutableResourceRequest(), fetcher->document()->securityOrigin(), options.allowCredentials);
|
|
|
| - if (ResourcePtr<ImageResource> cachedImage = loader->fetchImage(request))
|
| + if (ResourcePtr<ImageResource> cachedImage = fetcher->fetchImage(request))
|
| m_image = StyleFetchedImage::create(cachedImage.get());
|
| }
|
|
|
|
|