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

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 575 matching lines @@
       WebFeaturePolicy* parentFeaturePolicy =
           (isLoadingMainFrame() ? nullptr
                                 : m_frame->client()
                                       ->parent()
                                       ->securityContext()
                                       ->getFeaturePolicy());
       const String& featurePolicyHeader =
           m_documentLoader->response().httpHeaderField(
               HTTPNames::Feature_Policy);
       Vector<String> messages;
-      const WebParsedFeaturePolicyHeader& parsedHeader = parseFeaturePolicy(
+      const WebParsedFeaturePolicy& parsedHeader = parseFeaturePolicy(
           featurePolicyHeader, m_frame->securityContext()->getSecurityOrigin(),
           &messages);
-      m_frame->securityContext()->initializeFeaturePolicy(parsedHeader,
-                                                          parentFeaturePolicy);
+      const WebParsedFeaturePolicy& containerPolicy =
+          getContainerPolicyFromAllowedFeatures(
+              m_frame->owner()->allowedFeatures(),
+              m_frame->securityContext()->getSecurityOrigin());
+
+      m_frame->securityContext()->initializeFeaturePolicy(
+          parsedHeader, containerPolicy, parentFeaturePolicy);
       for (auto& message : messages) {
         m_frame->document()->addConsoleMessage(ConsoleMessage::create(
             OtherMessageSource, ErrorMessageLevel,
             "Error with Feature-Policy header: " + message));
       }
       if (!parsedHeader.isEmpty())
         client()->didSetFeaturePolicyHeader(parsedHeader);
     }
   }
 
@@ skipping 1366 matching lines @@
       frameLoadRequest.clientRedirect());
 
   loader->setLoadType(loadType);
   loader->setNavigationType(navigationType);
   loader->setReplacesCurrentHistoryItem(loadType ==
                                         FrameLoadTypeReplaceCurrentItem);
   return loader;
 }
 
 }  // namespace blink