Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(936)

Unified Diff: Source/core/frame/ContentSecurityPolicy.cpp

Issue 149953007: CSP 1.1: Remove last bits of 'X-WebKit-CSP'. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Test. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/ContentSecurityPolicyResponseHeaders.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/ContentSecurityPolicy.cpp
diff --git a/Source/core/frame/ContentSecurityPolicy.cpp b/Source/core/frame/ContentSecurityPolicy.cpp
index 47d0658d74128a63320d72f947e0333dbda4d804..6ea25a9454695727378e9226b5e84cc22429d076 100644
--- a/Source/core/frame/ContentSecurityPolicy.cpp
+++ b/Source/core/frame/ContentSecurityPolicy.cpp
@@ -1683,15 +1683,6 @@ void ContentSecurityPolicy::didReceiveHeaders(const ContentSecurityPolicyRespons
didReceiveHeader(headers.contentSecurityPolicy(), ContentSecurityPolicy::Enforce, ContentSecurityPolicy::HeaderSourceHTTP);
if (!headers.contentSecurityPolicyReportOnly().isEmpty())
didReceiveHeader(headers.contentSecurityPolicyReportOnly(), ContentSecurityPolicy::Report, ContentSecurityPolicy::HeaderSourceHTTP);
-
- // FIXME: Remove this reporting (and the 'xWebKitCSP*' methods) after the next release branch.
- if (m_client->isDocument()) {
- Document* document = static_cast<Document*>(m_client);
- if (!headers.xWebKitCSP().isEmpty())
- UseCounter::countDeprecation(*document, UseCounter::PrefixedContentSecurityPolicy);
- if (!headers.xWebKitCSPReportOnly().isEmpty())
- UseCounter::countDeprecation(*document, UseCounter::PrefixedContentSecurityPolicyReportOnly);
- }
}
void ContentSecurityPolicy::didReceiveHeader(const String& header, HeaderType type, HeaderSource source)
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/ContentSecurityPolicyResponseHeaders.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698