Title: [198390] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 198390
- Author
- [email protected]
- Date
- 2016-03-18 00:41:27 -0700 (Fri, 18 Mar 2016)
Log Message
Merge r198334 - Unreviewed, rolling out r198201.
https://bugs.webkit.org/show_bug.cgi?id=155585
That was not the proper solution (Requested by KaL on
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
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (198389 => 198390)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-18 07:34:26 UTC (rev 198389)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-18 07:41:27 UTC (rev 198390)
@@ -1,3 +1,18 @@
+2016-03-17 Commit Queue <[email protected]>
+
+ 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-14 Tomas Popela <[email protected]>
Enable GSS-Negotiate support in libsoup
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp (198389 => 198390)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-03-18 07:34:26 UTC (rev 198389)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-03-18 07:41:27 UTC (rev 198390)
@@ -102,17 +102,10 @@
// 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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
