| Index: Source/core/frame/csp/CSPSource.cpp
|
| diff --git a/Source/core/frame/csp/CSPSource.cpp b/Source/core/frame/csp/CSPSource.cpp
|
| index 7d8c0ef26e3799576d63da49225bd0534d1e2d93..1202b0aca47a760e5d46f9e985281cd544fc86e0 100644
|
| --- a/Source/core/frame/csp/CSPSource.cpp
|
| +++ b/Source/core/frame/csp/CSPSource.cpp
|
| @@ -13,14 +13,14 @@
|
|
|
| namespace blink {
|
|
|
| -CSPSource::CSPSource(ContentSecurityPolicy* policy, const String& scheme, const String& host, int port, const String& path, WildcardDisposition hostWildcard, WildcardDisposition portWildcard)
|
| +CSPSource::CSPSource(ContentSecurityPolicy* policy, const String& scheme, const String& host, int port, const String& path, bool hostHasWildcard, bool portHasWildcard)
|
| : m_policy(policy)
|
| , m_scheme(scheme)
|
| , m_host(host)
|
| , m_port(port)
|
| , m_path(path)
|
| - , m_hostWildcard(hostWildcard)
|
| - , m_portWildcard(portWildcard)
|
| + , m_hostHasWildcard(hostHasWildcard)
|
| + , m_portHasWildcard(portHasWildcard)
|
| {
|
| }
|
|
|
| @@ -45,7 +45,7 @@
|
| const String& host = url.host();
|
| if (equalIgnoringCase(host, m_host))
|
| return true;
|
| - return m_hostWildcard == HasWildcard && host.endsWith("." + m_host, false);
|
| + return m_hostHasWildcard && host.endsWith("." + m_host, false);
|
|
|
| }
|
|
|
| @@ -64,7 +64,7 @@
|
|
|
| bool CSPSource::portMatches(const KURL& url) const
|
| {
|
| - if (m_portWildcard == HasWildcard)
|
| + if (m_portHasWildcard)
|
| return true;
|
|
|
| int port = url.port();
|
|
|