| Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| index 0610418fd1c887b2c6234a917927ef78991a3ac6..9210a9cdbe6ff2d5a90ba799f1ac57e6ce7792ec 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -580,7 +580,7 @@ void FrameLoader::didBeginDocument() {
|
| m_frame->document(),
|
| m_documentLoader->response().httpHeaderField(HTTPNames::Origin_Trial));
|
| if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
|
| - FeaturePolicy* parentFeaturePolicy =
|
| + WebFeaturePolicy* parentFeaturePolicy =
|
| (isLoadingMainFrame() ? nullptr
|
| : m_frame->client()
|
| ->parent()
|
| @@ -590,10 +590,9 @@ void FrameLoader::didBeginDocument() {
|
| m_documentLoader->response().httpHeaderField(
|
| HTTPNames::Feature_Policy);
|
| Vector<String> messages;
|
| - const WebParsedFeaturePolicy& parsedHeader =
|
| - FeaturePolicy::parseFeaturePolicy(
|
| - featurePolicyHeader,
|
| - m_frame->securityContext()->getSecurityOrigin(), &messages);
|
| + const WebParsedFeaturePolicyHeader& parsedHeader = parseFeaturePolicy(
|
| + featurePolicyHeader, m_frame->securityContext()->getSecurityOrigin(),
|
| + &messages);
|
| m_frame->securityContext()->setFeaturePolicyFromHeader(
|
| parsedHeader, parentFeaturePolicy);
|
| for (auto& message : messages) {
|
|
|