diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-11 05:56:18 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 10:25:26 +0000 |
commit | 79143ccfc158ec4fffc49eee600d600edb342b16 (patch) | |
tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebCore/html/HTMLLinkElement.cpp | |
parent | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (diff) | |
download | qtwebkit-79143ccfc158ec4fffc49eee600d600edb342b16.tar.gz |
Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8
Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/html/HTMLLinkElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLLinkElement.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebCore/html/HTMLLinkElement.cpp b/Source/WebCore/html/HTMLLinkElement.cpp index 49c15ce12..4a73e530d 100644 --- a/Source/WebCore/html/HTMLLinkElement.cpp +++ b/Source/WebCore/html/HTMLLinkElement.cpp @@ -32,6 +32,7 @@ #include "CachedResource.h" #include "CachedResourceLoader.h" #include "CachedResourceRequest.h" +#include "ContentSecurityPolicy.h" #include "Document.h" #include "Event.h" #include "EventSender.h" @@ -245,6 +246,13 @@ void HTMLLinkElement::process() priority = ResourceLoadPriority::VeryLow; CachedResourceRequest request(ResourceRequest(document().completeURL(url)), charset, priority); request.setInitiator(this); + + if (document().contentSecurityPolicy()->allowStyleWithNonce(fastGetAttribute(HTMLNames::nonceAttr))) { + ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions(); + options.setContentSecurityPolicyImposition(ContentSecurityPolicyImposition::SkipPolicyCheck); + request.setOptions(options); + } + m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(request); if (m_cachedSheet) |