Backed out changeset ae33b9c001e5 (bug 1580462) for build bustages on nsWindow.cpp. CLOSED TREE

dom/html/HTMLIFrameElement.cpp

@@ -57,6 +57,7 @@ HTMLIFrameElement::HTMLIFrameElement(
     : nsGenericHTMLFrameElement(std::move(aNodeInfo), aFromParser) {
   // We always need a featurePolicy, even if not exposed.
   mFeaturePolicy = new mozilla::dom::FeaturePolicy(this);
+
   nsCOMPtr<nsIPrincipal> origin = GetFeaturePolicyDefaultOrigin();
   MOZ_ASSERT(origin);
   mFeaturePolicy->SetDefaultOrigin(origin);
@@ -229,42 +230,6 @@ mozilla::dom::FeaturePolicy* HTMLIFrameElement::FeaturePolicy() const {
   return mFeaturePolicy;
 }
 
-void HTMLIFrameElement::MaybeStoreCrossOriginFeaturePolicy() {
-  if (!mFrameLoader) {
-    return;
-  }
-
-  // If the browsingContext is not ready (because docshell is dead), don't try
-  // to create one.
-  if (!mFrameLoader->IsRemoteFrame() && !mFrameLoader->GetExistingDocShell()) {
-    return;
-  }
-
-  RefPtr<BrowsingContext> browsingContext = mFrameLoader->GetBrowsingContext();
-
-  if (!browsingContext || !browsingContext->IsContentSubframe()) {
-    return;
-  }
-
-  // If we are in subframe cross origin, store the featurePolicy to
-  // browsingContext
-  nsPIDOMWindowOuter* topWindow = browsingContext->Top()->GetDOMWindow();
-  if (NS_WARN_IF(!topWindow)) {
-    return;
-  }
-
-  Document* topLevelDocument = topWindow->GetExtantDoc();
-  if (NS_WARN_IF(!topLevelDocument)) {
-    return;
-  }
-
-  if (!NS_SUCCEEDED(nsContentUtils::CheckSameOrigin(topLevelDocument, this))) {
-    return;
-  }
-
-  browsingContext->SetFeaturePolicy(mFeaturePolicy);
-}
-
 already_AddRefed<nsIPrincipal>
 HTMLIFrameElement::GetFeaturePolicyDefaultOrigin() const {
   nsCOMPtr<nsIPrincipal> principal;
@@ -317,8 +282,6 @@ void HTMLIFrameElement::RefreshFeaturePolicy(bool aParseAllowAttribute) {
   if (AllowFullscreen()) {
     mFeaturePolicy->MaybeSetAllowedPolicy(NS_LITERAL_STRING("fullscreen"));
   }
-
-  MaybeStoreCrossOriginFeaturePolicy();
 }
 
 }  // namespace dom