| Index: third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp b/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
|
| index a5f04d7c2f05ecd4db7096e7967ab55688215817..dd061cd16411100f48d3bd660f2cc46212b24c21 100644
|
| --- a/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
|
| @@ -46,9 +46,11 @@ CSPSourceList::CSPSourceList(ContentSecurityPolicy* policy,
|
| bool CSPSourceList::matches(
|
| const KURL& url,
|
| ResourceRequest::RedirectStatus redirectStatus) const {
|
| - // Wildcards match network schemes ('http', 'https', 'ws', 'wss'), and the scheme of the
|
| - // protected resource: https://w3c.github.io/webappsec-csp/#match-url-to-source-expression.
|
| - // Other schemes, including custom schemes, must be explicitly listed in a source list.
|
| + // Wildcards match network schemes ('http', 'https', 'ws', 'wss'), and the
|
| + // scheme of the protected resource:
|
| + // https://w3c.github.io/webappsec-csp/#match-url-to-source-expression. Other
|
| + // schemes, including custom schemes, must be explicitly listed in a source
|
| + // list.
|
| if (m_allowStar) {
|
| if (url.protocolIsInHTTPFamily() || url.protocolIs("ws") ||
|
| url.protocolIs("wss") || m_policy->protocolMatchesSelf(url))
|
| @@ -346,7 +348,8 @@ bool CSPSourceList::parseHash(
|
|
|
| for (const auto& algorithm : kSupportedPrefixes) {
|
| prefix = algorithm.prefix;
|
| - // TODO(esprehn): Should be StringView(begin, end - begin).startsWith(prefix).
|
| + // TODO(esprehn): Should be StringView(begin, end -
|
| + // begin).startsWith(prefix).
|
| if (hashLength > prefix.length() &&
|
| equalIgnoringCase(prefix, StringView(begin, prefix.length()))) {
|
| hashAlgorithm = algorithm.type;
|
|
|