diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebCore/html/HTMLLinkElement.cpp | |
parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
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) |