Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp b/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
index a17c5bb..bff7146 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
+++ b/src/third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp
@@ -11,38 +11,9 @@
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/HashSet.h"
-#include "wtf/StringHasher.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/WTFString.h"
 
-namespace WTF {
-
-struct DigestValueHash {
-    static unsigned hash(const WebCore::DigestValue& v)
-    {
-        return StringHasher::computeHash(v.data(), v.size());
-    }
-    static bool equal(const WebCore::DigestValue& a, const WebCore::DigestValue& b)
-    {
-        return a == b;
-    };
-    static const bool safeToCompareToEmptyOrDeleted = true;
-};
-template <>
-struct DefaultHash<WebCore::DigestValue> {
-    typedef DigestValueHash Hash;
-};
-
-template <>
-struct DefaultHash<WebCore::ContentSecurityPolicyHashAlgorithm> {
-    typedef IntHash<WebCore::ContentSecurityPolicyHashAlgorithm> Hash;
-};
-template <>
-struct HashTraits<WebCore::ContentSecurityPolicyHashAlgorithm> : UnsignedWithZeroKeyHashTraits<WebCore::ContentSecurityPolicyHashAlgorithm> {
-};
-
-} // namespace WTF
-
 namespace WebCore {
 
 static bool isSourceListNone(const UChar* begin, const UChar* end)
@@ -187,25 +158,23 @@ bool CSPSourceList::parseSource(const UChar* begin, const UChar* end, String& sc
         return true;
     }
 
-    if (m_policy->experimentalFeaturesEnabled()) {
-        String nonce;
-        if (!parseNonce(begin, end, nonce))
-            return false;
+    String nonce;
+    if (!parseNonce(begin, end, nonce))
+        return false;
 
-        if (!nonce.isNull()) {
-            addSourceNonce(nonce);
-            return true;
-        }
+    if (!nonce.isNull()) {
+        addSourceNonce(nonce);
+        return true;
+    }
 
-        DigestValue hash;
-        ContentSecurityPolicyHashAlgorithm algorithm = ContentSecurityPolicyHashAlgorithmNone;
-        if (!parseHash(begin, end, hash, algorithm))
-            return false;
+    DigestValue hash;
+    ContentSecurityPolicyHashAlgorithm algorithm = ContentSecurityPolicyHashAlgorithmNone;
+    if (!parseHash(begin, end, hash, algorithm))
+        return false;
 
-        if (hash.size() > 0) {
-            addSourceHash(algorithm, hash);
-            return true;
-        }
+    if (hash.size() > 0) {
+        addSourceHash(algorithm, hash);
+        return true;
     }
 
     const UChar* position = begin;