| Index: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| index e43dcc018993fe6a35947797b82768508daa9abc..8e3868b9799155fbac232119b26b90893f350450 100644
|
| --- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "web/WebRemoteFrameImpl.h"
|
|
|
| +#include <v8/include/v8.h>
|
| #include "core/dom/Fullscreen.h"
|
| #include "core/dom/RemoteSecurityContext.h"
|
| #include "core/dom/SecurityContext.h"
|
| @@ -14,6 +15,7 @@
|
| #include "core/layout/LayoutObject.h"
|
| #include "core/page/Page.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"
|
| @@ -24,7 +26,6 @@
|
| #include "web/RemoteFrameOwner.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebViewImpl.h"
|
| -#include <v8/include/v8.h>
|
|
|
| namespace blink {
|
|
|
| @@ -428,13 +429,13 @@ void WebRemoteFrameImpl::setReplicatedName(const WebString& name,
|
| void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader(
|
| const WebParsedFeaturePolicyHeader& parsedHeader) const {
|
| if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
|
| - FeaturePolicy* parentFeaturePolicy = nullptr;
|
| + WebFeaturePolicy* parentFeaturePolicy = nullptr;
|
| if (parent()) {
|
| Frame* parentFrame = frame()->client()->parent();
|
| parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy();
|
| }
|
| - frame()->securityContext()->setFeaturePolicyFromHeader(parsedHeader,
|
| - parentFeaturePolicy);
|
| + frame()->securityContext()->initializeFeaturePolicy(parsedHeader,
|
| + parentFeaturePolicy);
|
| }
|
| }
|
|
|
|
|