Replicate feature policy container policies.

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

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 185 matching lines @@
   return (content_frame_ && content_frame_->IsLocalFrame())
              ? ToLocalFrame(content_frame_)->GetDocument()
              : 0;
 }
 
 DOMWindow* HTMLFrameOwnerElement::contentWindow() const {
   return content_frame_ ? content_frame_->DomWindow() : 0;
 }
 
 void HTMLFrameOwnerElement::SetSandboxFlags(SandboxFlags flags) {
   sandbox_flags_ = flags;

[dcheng, 2017/04/18 16:26:37]

How come this doesn't need to refresh container_policy_? Couldn't setting
sandbox flags change the origin used for feature policy?

[iclelland, 2017/04/18 19:19:44]

That's a really good point, it should update that if the allow-same-origin flag
changes. I've added a test in site_per_process_browsertests to ensure that the
policy origin is changed properly.

-  // Don't notify about updates if contentFrame() is null, for example when
+  // Don't notify about updates if ContentFrame() is null, for example when
   // the subframe hasn't been created yet.
-  if (ContentFrame())
-    GetDocument().GetFrame()->Loader().Client()->DidChangeSandboxFlags(
-        ContentFrame(), flags);
+  if (ContentFrame()) {
+    GetDocument().GetFrame()->Loader().Client()->DidChangeFramePolicy(
+        ContentFrame(), sandbox_flags_, container_policy_);
+  }
 }
 
 bool HTMLFrameOwnerElement::IsKeyboardFocusable() const {
   return content_frame_ && HTMLElement::IsKeyboardFocusable();
 }
 
 void HTMLFrameOwnerElement::DisposeWidgetSoon(FrameViewBase* frame_view_base) {
   if (g_update_suspend_count) {
     WidgetsPendingDispose().insert(frame_view_base);
     return;
   }
   frame_view_base->Dispose();
 }
 
+void HTMLFrameOwnerElement::UpdateContainerPolicy() {
+  container_policy_ = GetContainerPolicyFromAllowedFeatures(
+      AllowedFeatures(), GetOriginForFeaturePolicy());
+  // Don't notify about updates if ContentFrame() is null, for example when
+  // the subframe hasn't been created yet.
+  if (ContentFrame()) {
+    GetDocument().GetFrame()->Loader().Client()->DidChangeFramePolicy(
+        ContentFrame(), sandbox_flags_, container_policy_);
+  }
+}
+
 void HTMLFrameOwnerElement::FrameOwnerPropertiesChanged() {
-  // Don't notify about updates if contentFrame() is null, for example when
+  // Don't notify about updates if ContentFrame() is null, for example when
   // the subframe hasn't been created yet.
-  if (ContentFrame())
+  if (ContentFrame()) {
     GetDocument().GetFrame()->Loader().Client()->DidChangeFrameOwnerProperties(
         this);
+  }
 }
 
 void HTMLFrameOwnerElement::DispatchLoad() {
   DispatchScopedEvent(Event::Create(EventTypeNames::load));
 }
 
 const WebVector<WebFeaturePolicyFeature>&
 HTMLFrameOwnerElement::AllowedFeatures() const {
   DEFINE_STATIC_LOCAL(WebVector<WebFeaturePolicyFeature>, features, ());
   return features;
 }
 
+const WebParsedFeaturePolicy& HTMLFrameOwnerElement::ContainerPolicy() const {
+  return container_policy_;
+}
+
 Document* HTMLFrameOwnerElement::getSVGDocument(
     ExceptionState& exception_state) const {
   Document* doc = contentDocument();
   if (doc && doc->IsSVGDocument())
     return doc;
   return nullptr;
 }
 
 void HTMLFrameOwnerElement::SetWidget(FrameViewBase* frame_view_base) {
   if (frame_view_base == widget_)
@@ skipping 48 matching lines @@
 }
 
 FrameViewBase* HTMLFrameOwnerElement::OwnedWidget() const {
   return widget_.Get();
 }
 
 bool HTMLFrameOwnerElement::LoadOrRedirectSubframe(
     const KURL& url,
     const AtomicString& frame_name,
     bool replace_current_item) {
+  UpdateContainerPolicy();
+
   LocalFrame* parent_frame = GetDocument().GetFrame();
   if (ContentFrame()) {
     ContentFrame()->Navigate(GetDocument(), url, replace_current_item,
                              UserGestureStatus::kNone);
     return true;
   }
 
   if (!GetDocument().GetSecurityOrigin()->CanDisplay(url)) {
     FrameLoader::ReportLocalLoadFailed(parent_frame, url.GetString());
     return false;
@@ skipping 20 matching lines @@
 }
 
 DEFINE_TRACE(HTMLFrameOwnerElement) {
   visitor->Trace(content_frame_);
   visitor->Trace(widget_);
   HTMLElement::Trace(visitor);
   FrameOwner::Trace(visitor);
 }
 
 }  // namespace blink