Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / csp / CSPSourceList.h

diff --git a/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.h b/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.h
index 982677d..d52a09a 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.h
+++ b/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.h
@@ -33,10 +33,10 @@ public:
     bool isHashOrNoncePresent() const;
 
 private:
-    bool parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, int& port, String& path, bool& hostHasWildcard, bool& portHasWildcard);
+    bool parseSource(const UChar* begin, const UChar* end, String& scheme, String& host, int& port, String& path, CSPSource::WildcardDisposition&, CSPSource::WildcardDisposition&);
     bool parseScheme(const UChar* begin, const UChar* end, String& scheme);
-    bool parseHost(const UChar* begin, const UChar* end, String& host, bool& hostHasWildcard);
-    bool parsePort(const UChar* begin, const UChar* end, int& port, bool& portHasWildcard);
+    bool parseHost(const UChar* begin, const UChar* end, String& host, CSPSource::WildcardDisposition&);
+    bool parsePort(const UChar* begin, const UChar* end, int& port, CSPSource::WildcardDisposition&);
     bool parsePath(const UChar* begin, const UChar* end, String& path);
     bool parseNonce(const UChar* begin, const UChar* end, String& nonce);
     bool parseHash(const UChar* begin, const UChar* end, DigestValue& hash, ContentSecurityPolicyHashAlgorithm&);
@@ -51,6 +51,7 @@ private:
     ContentSecurityPolicy* m_policy;
     Vector<CSPSource> m_list;
     String m_directiveName;
+    bool m_allowSelf;
     bool m_allowStar;
     bool m_allowInline;
     bool m_allowEval;