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

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

Issue 1487343002: Set credentials mode "same-origin" when crossOrigin=anonymous is set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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 f63bae4d0d6df3793504452c7c5884f8fcb08193..e88af3ad76d69015cd139a4c23f09c7268767b31 100644
--- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
@@ -26,8 +26,10 @@
#include "core/fetch/FetchInitiatorTypeNames.h"
#include "core/fetch/FetchRequest.h"
#include "core/fetch/ImageResource.h"
+#include "core/fetch/ResourceFetcher.h"
#include "core/loader/MixedContentChecker.h"
#include "core/style/StyleFetchedImage.h"
+#include "platform/CrossOriginAttributeValue.h"
#include "platform/weborigin/KURL.h"
#include "platform/weborigin/SecurityPolicy.h"
@@ -46,18 +48,18 @@ CSSImageValue::~CSSImageValue()
{
}
-StyleFetchedImage* CSSImageValue::cacheImage(Document* document, const ResourceLoaderOptions& options)
+StyleFetchedImage* CSSImageValue::cacheImage(Document* document, CrossOriginAttributeValue crossOrigin)
{
ASSERT(document);
if (m_isCachePending) {
m_isCachePending = false;
- FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
+ FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName);
request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.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_cachedImage = StyleFetchedImage::create(cachedImage.get(), document, request.url());

Powered by Google App Engine
This is Rietveld 408576698