Chromium Code Reviews| 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 22e296b62586eb79f0ba8352fa68802afc2e7e9b..125f5e2608a9f66a27cb17d8734c3b262307da6d 100644 |
| --- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp |
| @@ -426,13 +426,8 @@ void WebRemoteFrameImpl::SetReplicatedFeaturePolicyHeader( |
| parent_frame->GetSecurityContext()->GetFeaturePolicy(); |
| } |
| WebParsedFeaturePolicy container_policy; |
| - if (GetFrame() && GetFrame()->Owner()) { |
| - container_policy = GetContainerPolicyFromAllowedFeatures( |
| - GetFrame()->Owner()->AllowedFeatures(), |
| - GetFrame()->Owner()->AllowFullscreen(), |
| - GetFrame()->Owner()->AllowPaymentRequest(), |
| - GetFrame()->GetSecurityContext()->GetSecurityOrigin()); |
| - } |
| + if (GetFrame() && GetFrame()->Owner()) |
|
dcheng
2017/05/04 21:36:31
Drive-by: don't null check GetFrame() here (it's d
iclelland
2017/05/05 14:55:14
Done, thanks
|
| + container_policy = GetFrame()->Owner()->ContainerPolicy(); |
| GetFrame()->GetSecurityContext()->InitializeFeaturePolicy( |
| parsed_header, container_policy, parent_feature_policy); |
| } |