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

Unified Diff: third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp

Issue 2648423002: Rename feature policy classes. (Closed)
Patch Set: Rebase Created 3 years, 11 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
Index: third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
diff --git a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
index 44d6c96359a7499994c6a3ded2c65001bcdcc404..f2d6cf5d8e37698a773244b532c72dc583bef7c0 100644
--- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
+++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
@@ -61,12 +61,12 @@ const FeaturePolicy::Feature kWebRTC{
// static
std::unique_ptr<FeaturePolicy::Whitelist> FeaturePolicy::Whitelist::from(
- const WebFeaturePolicy::ParsedWhitelist& parsedWhitelist) {
+ const WebParsedFeaturePolicyDeclaration& parsedDeclaration) {
std::unique_ptr<Whitelist> whitelist(new FeaturePolicy::Whitelist);
- if (parsedWhitelist.matchesAllOrigins) {
+ if (parsedDeclaration.matchesAllOrigins) {
whitelist->addAll();
} else {
- for (const WebSecurityOrigin& origin : parsedWhitelist.origins)
+ for (const WebSecurityOrigin& origin : parsedDeclaration.origins)
whitelist->add(static_cast<WTF::PassRefPtr<SecurityOrigin>>(origin));
}
return whitelist;
@@ -148,11 +148,11 @@ std::unique_ptr<FeaturePolicy> FeaturePolicy::createFromParentPolicy(
}
// static
-WebParsedFeaturePolicy FeaturePolicy::parseFeaturePolicy(
+WebParsedFeaturePolicyHeader FeaturePolicy::parseFeaturePolicy(
const String& policy,
RefPtr<SecurityOrigin> origin,
Vector<String>* messages) {
- Vector<WebFeaturePolicy::ParsedWhitelist> whitelists;
+ Vector<WebParsedFeaturePolicyDeclaration> whitelists;
// Use a reasonable parse depth limit; the actual maximum depth is only going
// to be 4 for a valid policy, but we'll give the featurePolicyParser a chance
@@ -182,7 +182,7 @@ WebParsedFeaturePolicy FeaturePolicy::parseFeaturePolicy(
continue;
}
- WebFeaturePolicy::ParsedWhitelist whitelist;
+ WebParsedFeaturePolicyDeclaration whitelist;
whitelist.featureName = featureName;
Vector<WebSecurityOrigin> origins;
String targetString;
@@ -211,14 +211,15 @@ WebParsedFeaturePolicy FeaturePolicy::parseFeaturePolicy(
return whitelists;
}
-void FeaturePolicy::setHeaderPolicy(const WebParsedFeaturePolicy& policy) {
+void FeaturePolicy::setHeaderPolicy(
+ const WebParsedFeaturePolicyHeader& policy) {
DCHECK(m_headerWhitelists.isEmpty());
- for (const WebFeaturePolicy::ParsedWhitelist& parsedWhitelist : policy) {
+ for (const WebParsedFeaturePolicyDeclaration& parsedDeclaration : policy) {
const FeaturePolicy::Feature* feature =
- featureForName(parsedWhitelist.featureName, m_features);
+ featureForName(parsedDeclaration.featureName, m_features);
if (!feature)
continue;
- m_headerWhitelists.set(feature, Whitelist::from(parsedWhitelist));
+ m_headerWhitelists.set(feature, Whitelist::from(parsedDeclaration));
}
}

Powered by Google App Engine
This is Rietveld 408576698