Move container policy logic to frame owner classes.

third_party/WebKit/Source/core/html/HTMLIFrameElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Ericsson AB. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 180 matching lines @@
     }
     FrameOwnerPropertiesChanged();
     UpdateContainerPolicy();
   } else {
     if (name == srcAttr)
       LogUpdateAttributeIfIsolatedWorldAndInDocument("iframe", params);
     HTMLFrameElementBase::ParseAttribute(params);
   }
 }
 
+Vector<WebParsedFeaturePolicyDeclaration>
+HTMLIFrameElement::ConstructContainerPolicy() const {
+  RefPtr<SecurityOrigin> origin = GetOriginForFeaturePolicy();
+  Vector<WebParsedFeaturePolicyDeclaration> container_policy;
+
+  // Populate the initial container policy from the allow attribute.
+  for (const WebFeaturePolicyFeature feature : AllowedFeatures()) {
+    WebParsedFeaturePolicyDeclaration whitelist;
+    whitelist.feature = feature;
+    whitelist.origins = Vector<WebSecurityOrigin>(1UL, {origin});
+    container_policy.push_back(whitelist);
+  }
+
+  // If allowfullscreen attribute is present and no fullscreen policy is set,
+  // enable the feature for all origins; similarly for allowpaymentrequest.
+  if (AllowFullscreen()) {
+    bool can_override_fullscreen = true;

[foolip, 2017/06/13 14:59:30]

Maybe call this any_fullscreen_policy or similar (with inverted semantics, any
instead of none) to match how the comment is phrased?

[iclelland, 2017/06/13 18:36:47]

Done.

+    for (const auto& declaration : container_policy) {
+      if (declaration.feature == WebFeaturePolicyFeature::kFullscreen) {
+        can_override_fullscreen = false;
+        break;
+      }
+    }
+    if (can_override_fullscreen) {
+      WebParsedFeaturePolicyDeclaration whitelist;
+      whitelist.feature = WebFeaturePolicyFeature::kFullscreen;
+      whitelist.matches_all_origins = true;
+      whitelist.origins = Vector<WebSecurityOrigin>(0UL);
+      container_policy.push_back(whitelist);
+    }
+  }
+  if (AllowPaymentRequest()) {
+    bool can_override_payment = true;
+    for (const auto& declaration : container_policy) {
+      if (declaration.feature == WebFeaturePolicyFeature::kPayment) {
+        can_override_payment = false;
+        break;
+      }
+    }
+    if (can_override_payment) {
+      WebParsedFeaturePolicyDeclaration whitelist;
+      whitelist.feature = WebFeaturePolicyFeature::kPayment;
+      whitelist.matches_all_origins = true;
+      whitelist.origins = Vector<WebSecurityOrigin>(0UL);
+      container_policy.push_back(whitelist);
+    }
+  }
+
+  return container_policy;
+}
+
 bool HTMLIFrameElement::LayoutObjectIsNeeded(const ComputedStyle& style) {
   return ContentFrame() && !collapsed_by_client_ &&
          HTMLElement::LayoutObjectIsNeeded(style);
 }
 
 LayoutObject* HTMLIFrameElement::CreateLayoutObject(const ComputedStyle&) {
   return new LayoutIFrame(this);
 }
 
 Node::InsertionNotificationRequest HTMLIFrameElement::InsertedInto(
@@ skipping 14 matching lines @@
 
 bool HTMLIFrameElement::IsInteractiveContent() const {
   return true;
 }
 
 ReferrerPolicy HTMLIFrameElement::ReferrerPolicyAttribute() {
   return referrer_policy_;
 }
 
 }  // namespace blink