Backed out 3 changesets (bug 1514474, bug 1514296) for mochitest fail…

…ures on test_featureList.html. CLOSED TREE

Backed out changeset 52ae606e4cfa (bug 1514296)
Backed out changeset e74168e44dd7 (bug 1514474)
Backed out changeset a43f3aa0ea77 (bug 1514296)

dom/base/Document.cpp

@@ -2211,7 +2211,7 @@ nsresult Document::Init() {
 
   // we need to create a policy here so getting the policy within
   // ::Policy() can *always* return a non null policy
-  mFeaturePolicy = new mozilla::dom::FeaturePolicy(this);
+  mFeaturePolicy = new FeaturePolicy(this);
   mFeaturePolicy->SetDefaultOrigin(NodePrincipal());
 
   mStyleSet = MakeUnique<ServoStyleSet>(*this);
@@ -3275,14 +3275,14 @@ nsresult Document::InitFeaturePolicy(nsIChannel* aChannel) {
 
   mFeaturePolicy->SetDefaultOrigin(NodePrincipal());
 
-  RefPtr<mozilla::dom::FeaturePolicy> parentPolicy = nullptr;
+  RefPtr<FeaturePolicy> parentPolicy = nullptr;
   if (mDocumentContainer) {
     nsPIDOMWindowOuter* containerWindow = mDocumentContainer->GetWindow();
     if (containerWindow) {
       nsCOMPtr<nsINode> node = containerWindow->GetFrameElementInternal();
       HTMLIFrameElement* iframe = HTMLIFrameElement::FromNodeOrNull(node);
       if (iframe) {
-        parentPolicy = iframe->FeaturePolicy();
+        parentPolicy = iframe->Policy();
       }
     }
   }
@@ -12573,10 +12573,10 @@ void Document::MaybeResolveReadyForIdle() {
   }
 }
 
-mozilla::dom::FeaturePolicy* Document::FeaturePolicy() const {
+FeaturePolicy* Document::Policy() const {
   // The policy is created when the document is initialized. We _must_ have a
   // policy here even if the featurePolicy pref is off. If this assertion fails,
-  // it means that ::FeaturePolicy() is called before ::StartDocumentLoad().
+  // it means that ::Policy() is called before ::StartDocumentLoad().
   MOZ_ASSERT(mFeaturePolicy);
   return mFeaturePolicy;
 }

dom/base/Document.h

@@ -4052,7 +4052,7 @@ class Document : public nsINode,
     mAllowPaymentRequest = aAllowPaymentRequest;
   }
 
-  mozilla::dom::FeaturePolicy* FeaturePolicy() const;
+  FeaturePolicy* Policy() const;
 
   bool ModuleScriptsEnabled();
 
@@ -4474,7 +4474,7 @@ class Document : public nsINode,
 
   RefPtr<Promise> mReadyForIdle;
 
-  RefPtr<mozilla::dom::FeaturePolicy> mFeaturePolicy;
+  RefPtr<FeaturePolicy> mFeaturePolicy;
 
   UniquePtr<ResizeObserverController> mResizeObserverController;
 

dom/html/HTMLIFrameElement.cpp

@@ -54,7 +54,7 @@ HTMLIFrameElement::HTMLIFrameElement(
     FromParser aFromParser)
     : nsGenericHTMLFrameElement(std::move(aNodeInfo), aFromParser) {
   // We always need a featurePolicy, even if not exposed.
-  mFeaturePolicy = new mozilla::dom::FeaturePolicy(this);
+  mFeaturePolicy = new FeaturePolicy(this);
 
   nsCOMPtr<nsIPrincipal> origin = GetFeaturePolicyDefaultOrigin();
   MOZ_ASSERT(origin);
@@ -224,9 +224,7 @@ JSObject* HTMLIFrameElement::WrapNode(JSContext* aCx,
   return HTMLIFrameElement_Binding::Wrap(aCx, this, aGivenProto);
 }
 
-mozilla::dom::FeaturePolicy* HTMLIFrameElement::FeaturePolicy() const {
-  return mFeaturePolicy;
-}
+FeaturePolicy* HTMLIFrameElement::Policy() const { return mFeaturePolicy; }
 
 already_AddRefed<nsIPrincipal>
 HTMLIFrameElement::GetFeaturePolicyDefaultOrigin() const {
@@ -270,7 +268,7 @@ void HTMLIFrameElement::RefreshFeaturePolicy(bool aParseAllowAttribute) {
                                         origin);
     }
 
-    mFeaturePolicy->InheritPolicy(OwnerDoc()->FeaturePolicy());
+    mFeaturePolicy->InheritPolicy(OwnerDoc()->Policy());
   }
 
   if (AllowPaymentRequest()) {

dom/html/HTMLIFrameElement.h

@@ -154,7 +154,7 @@ class HTMLIFrameElement final : public nsGenericHTMLFrameElement {
   bool FullscreenFlag() const { return mFullscreenFlag; }
   void SetFullscreenFlag(bool aValue) { mFullscreenFlag = aValue; }
 
-  mozilla::dom::FeaturePolicy* FeaturePolicy() const;
+  FeaturePolicy* Policy() const;
 
  protected:
   virtual ~HTMLIFrameElement();

dom/security/featurepolicy/FeaturePolicy.cpp

@@ -90,7 +90,7 @@ void FeaturePolicy::ResetDeclaredPolicy() { mFeatures.Clear(); }
 
 JSObject* FeaturePolicy::WrapObject(JSContext* aCx,
                                     JS::Handle<JSObject*> aGivenProto) {
-  return FeaturePolicy_Binding::Wrap(aCx, this, aGivenProto);
+  return Policy_Binding::Wrap(aCx, this, aGivenProto);
 }
 
 bool FeaturePolicy::AllowsFeature(const nsAString& aFeatureName,
@@ -148,16 +148,6 @@ bool FeaturePolicy::AllowsFeatureInternal(const nsAString& aFeatureName,
   return false;
 }
 
-void FeaturePolicy::Features(nsTArray<nsString>& aFeatures) {
-  RefPtr<FeaturePolicy> self = this;
-  FeaturePolicyUtils::ForEachFeature(
-      [self, &aFeatures](const char* aFeatureName) {
-        nsString featureName;
-        featureName.AppendASCII(aFeatureName);
-        aFeatures.AppendElement(featureName);
-      });
-}
-
 void FeaturePolicy::AllowedFeatures(nsTArray<nsString>& aAllowedFeatures) {
   RefPtr<FeaturePolicy> self = this;
   FeaturePolicyUtils::ForEachFeature(

dom/security/featurepolicy/FeaturePolicy.h

@@ -113,8 +113,6 @@ class FeaturePolicy final : public nsISupports, public nsWrapperCache {
   bool AllowsFeature(const nsAString& aFeatureName,
                      const Optional<nsAString>& aOrigin) const;
 
-  void Features(nsTArray<nsString>& aFeatures);
-
   void AllowedFeatures(nsTArray<nsString>& aAllowedFeatures);
 
   void GetAllowlistForFeature(const nsAString& aFeatureName,

dom/security/featurepolicy/FeaturePolicyUtils.cpp

@@ -92,7 +92,7 @@ bool FeaturePolicyUtils::IsFeatureAllowed(Document* aDocument,
     return true;
   }
 
-  FeaturePolicy* policy = aDocument->FeaturePolicy();
+  FeaturePolicy* policy = aDocument->Policy();
   MOZ_ASSERT(policy);
 
   if (policy->AllowsFeatureInternal(aFeatureName, policy->DefaultOrigin())) {

dom/security/featurepolicy/test/mochitest/mochitest.ini

@@ -8,4 +8,3 @@ support-files =
   test_parser.html^headers^
 
 [test_parser.html]
-[test_featureList.html]