From 35fa9e2361c1a376e5077d94fe2d0444163d3989 Mon Sep 17 00:00:00 2001 From: Ciure Andrei Date: Mon, 8 Jul 2019 04:58:50 +0300 Subject: [PATCH] Backed out changeset fe8c2426d9d3 (bug 1514474) for causing beta simulation failures CLOSED TREE --- dom/security/featurepolicy/FeaturePolicy.cpp | 10 ----- dom/security/featurepolicy/FeaturePolicy.h | 2 - .../test/mochitest/mochitest.ini | 1 - .../test/mochitest/test_featureList.html | 42 ------------------- dom/webidl/FeaturePolicy.webidl | 1 - 5 files changed, 56 deletions(-) delete mode 100644 dom/security/featurepolicy/test/mochitest/test_featureList.html diff --git a/dom/security/featurepolicy/FeaturePolicy.cpp b/dom/security/featurepolicy/FeaturePolicy.cpp index 6e6b32505475..9af99ae9b054 100644 --- a/dom/security/featurepolicy/FeaturePolicy.cpp +++ b/dom/security/featurepolicy/FeaturePolicy.cpp @@ -148,16 +148,6 @@ bool FeaturePolicy::AllowsFeatureInternal(const nsAString& aFeatureName, return false; } -void FeaturePolicy::Features(nsTArray& aFeatures) { - RefPtr self = this; - FeaturePolicyUtils::ForEachFeature( - [self, &aFeatures](const char* aFeatureName) { - nsString featureName; - featureName.AppendASCII(aFeatureName); - aFeatures.AppendElement(featureName); - }); -} - void FeaturePolicy::AllowedFeatures(nsTArray& aAllowedFeatures) { RefPtr self = this; FeaturePolicyUtils::ForEachFeature( diff --git a/dom/security/featurepolicy/FeaturePolicy.h b/dom/security/featurepolicy/FeaturePolicy.h index 1fe517e3a3af..3856cd25d173 100644 --- a/dom/security/featurepolicy/FeaturePolicy.h +++ b/dom/security/featurepolicy/FeaturePolicy.h @@ -113,8 +113,6 @@ class FeaturePolicy final : public nsISupports, public nsWrapperCache { bool AllowsFeature(const nsAString& aFeatureName, const Optional& aOrigin) const; - void Features(nsTArray& aFeatures); - void AllowedFeatures(nsTArray& aAllowedFeatures); void GetAllowlistForFeature(const nsAString& aFeatureName, diff --git a/dom/security/featurepolicy/test/mochitest/mochitest.ini b/dom/security/featurepolicy/test/mochitest/mochitest.ini index a9598fd7ee39..3402c8662f4b 100644 --- a/dom/security/featurepolicy/test/mochitest/mochitest.ini +++ b/dom/security/featurepolicy/test/mochitest/mochitest.ini @@ -8,4 +8,3 @@ support-files = test_parser.html^headers^ [test_parser.html] -[test_featureList.html] diff --git a/dom/security/featurepolicy/test/mochitest/test_featureList.html b/dom/security/featurepolicy/test/mochitest/test_featureList.html deleted file mode 100644 index ed51d67092d9..000000000000 --- a/dom/security/featurepolicy/test/mochitest/test_featureList.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - Test feature policy - list - - - - - - - - diff --git a/dom/webidl/FeaturePolicy.webidl b/dom/webidl/FeaturePolicy.webidl index 88fcb98c4a30..cb5bb527a3d1 100644 --- a/dom/webidl/FeaturePolicy.webidl +++ b/dom/webidl/FeaturePolicy.webidl @@ -10,7 +10,6 @@ [NoInterfaceObject] interface Policy { boolean allowsFeature(DOMString feature, optional DOMString origin); - sequence features(); sequence allowedFeatures(); sequence getAllowlistForFeature(DOMString feature); };