Initial Implementation of Iframe Attribute for Feature Policy (Part 3)

third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/WebRemoteFrameImpl.h"
 
+#include <v8/include/v8.h>
 #include "core/dom/Fullscreen.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/dom/SecurityContext.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/page/Page.h"
+#include "platform/feature_policy/FeaturePolicy.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebFeaturePolicy.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebRect.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrameOwnerProperties.h"
 #include "public/web/WebPerformance.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebTreeScopeType.h"
 #include "web/RemoteFrameOwner.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
-#include <v8/include/v8.h>
 
 namespace blink {
 
 WebRemoteFrame* WebRemoteFrame::create(WebTreeScopeType scope,
                                        WebRemoteFrameClient* client,
                                        WebFrame* opener) {
   return WebRemoteFrameImpl::create(scope, client, opener);
 }
 
 WebRemoteFrameImpl* WebRemoteFrameImpl::create(WebTreeScopeType scope,
@@ skipping 381 matching lines @@
       static_cast<SandboxFlags>(flags));
 }
 
 void WebRemoteFrameImpl::setReplicatedName(const WebString& name,
                                            const WebString& uniqueName) const {
   DCHECK(frame());
   frame()->tree().setPrecalculatedName(name, uniqueName);
 }
 
 void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader(
-    const WebParsedFeaturePolicyHeader& parsedHeader) const {
+    const WebParsedFeaturePolicy& parsedHeader) const {
   if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
     WebFeaturePolicy* parentFeaturePolicy = nullptr;
     if (parent()) {
       Frame* parentFrame = frame()->client()->parent();
       parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy();
     }
-    frame()->securityContext()->initializeFeaturePolicy(parsedHeader,
-                                                        parentFeaturePolicy);
+    const WebParsedFeaturePolicy containerPolicy =
+        getContainerPolicyFromAllowedFeatures(
+            frame()->owner()->allowedFeatures(),
+            frame()->securityContext()->getSecurityOrigin());
+    frame()->securityContext()->initializeFeaturePolicy(
+        parsedHeader, containerPolicy, parentFeaturePolicy);
   }
 }
 
 void WebRemoteFrameImpl::addReplicatedContentSecurityPolicyHeader(
     const WebString& headerValue,
     WebContentSecurityPolicyType type,
     WebContentSecurityPolicySource source) const {
   frame()->securityContext()->contentSecurityPolicy()->addPolicyFromHeaderValue(
       headerValue, static_cast<ContentSecurityPolicyHeaderType>(type),
       static_cast<ContentSecurityPolicyHeaderSource>(source));
@@ skipping 79 matching lines @@
 }
 
 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
                                        WebRemoteFrameClient* client)
     : WebRemoteFrame(scope),
       m_frameClient(RemoteFrameClientImpl::create(this)),
       m_client(client),
       m_selfKeepAlive(this) {}
 
 }  // namespace blink