Unreviewed, rolling out r198201.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Mar 2016 16:43:41 +0000 (16:43 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Mar 2016 16:43:41 +0000 (16:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155585

That was not the proper solution (Requested by KaL on
#webkit).

Reverted changeset:

"REGRESSION (r197724): [GTK] Web Inspector: Images being
blocked by CSP 2.0"
https://bugs.webkit.org/show_bug.cgi?id=155432
http://trac.webkit.org/changeset/198201

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp

index 59798a6..a3abcf1 100644 (file)
@@ -1,3 +1,18 @@
+2016-03-17  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r198201.
+        https://bugs.webkit.org/show_bug.cgi?id=155585
+
+        That was not the proper solution (Requested by KaL on
+        #webkit).
+
+        Reverted changeset:
+
+        "REGRESSION (r197724): [GTK] Web Inspector: Images being
+        blocked by CSP 2.0"
+        https://bugs.webkit.org/show_bug.cgi?id=155432
+        http://trac.webkit.org/changeset/198201
+
 2016-03-16  Chris Fleizach  <cfleizach@apple.com>
 
         AX: Implement AutoFill Available attribute for a text field
index 9efc688..8044ae8 100644 (file)
@@ -104,17 +104,10 @@ bool ContentSecurityPolicySourceList::isProtocolAllowedByStar(const URL& url) co
     // FIXME: We should not hardcode the directive names. We should make use of the constants in ContentSecurityPolicyDirectiveList.cpp.
     // See <https://bugs.webkit.org/show_bug.cgi?id=155133>.
     bool isAllowed = url.protocolIsInHTTPFamily();
-    if (equalLettersIgnoringASCIICase(m_directiveName, "img-src")) {
+    if (equalLettersIgnoringASCIICase(m_directiveName, "img-src"))
         isAllowed |= url.protocolIsData();
-#if PLATFORM(GTK)
-        isAllowed |= url.protocolIs("resource");
-#endif
-    } else if (equalLettersIgnoringASCIICase(m_directiveName, "media-src")) {
+    else if (equalLettersIgnoringASCIICase(m_directiveName, "media-src"))
         isAllowed |= url.protocolIsData() || url.protocolIsBlob();
-#if PLATFORM(GTK)
-        isAllowed |= url.protocolIs("resource");
-#endif
-    }
     return isAllowed;
 }