| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "web/WebRemoteFrameImpl.h" | 5 #include "web/WebRemoteFrameImpl.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/DOMWrapperWorld.h" | 7 #include "bindings/core/v8/DOMWrapperWorld.h" |
| 8 #include "bindings/core/v8/WindowProxy.h" | 8 #include "bindings/core/v8/WindowProxy.h" |
| 9 #include "core/dom/Fullscreen.h" | 9 #include "core/dom/Fullscreen.h" |
| 10 #include "core/dom/RemoteSecurityContext.h" | 10 #include "core/dom/RemoteSecurityContext.h" |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 WebFeaturePolicy* parent_feature_policy = nullptr; | 423 WebFeaturePolicy* parent_feature_policy = nullptr; |
| 424 if (Parent()) { | 424 if (Parent()) { |
| 425 Frame* parent_frame = GetFrame()->Client()->Parent(); | 425 Frame* parent_frame = GetFrame()->Client()->Parent(); |
| 426 parent_feature_policy = | 426 parent_feature_policy = |
| 427 parent_frame->GetSecurityContext()->GetFeaturePolicy(); | 427 parent_frame->GetSecurityContext()->GetFeaturePolicy(); |
| 428 } | 428 } |
| 429 WebParsedFeaturePolicy container_policy; | 429 WebParsedFeaturePolicy container_policy; |
| 430 if (GetFrame() && GetFrame()->Owner()) { | 430 if (GetFrame() && GetFrame()->Owner()) { |
| 431 container_policy = GetContainerPolicyFromAllowedFeatures( | 431 container_policy = GetContainerPolicyFromAllowedFeatures( |
| 432 GetFrame()->Owner()->AllowedFeatures(), | 432 GetFrame()->Owner()->AllowedFeatures(), |
| 433 GetFrame()->Owner()->AllowFullscreen(), |
| 434 GetFrame()->Owner()->AllowPaymentRequest(), |
| 433 GetFrame()->GetSecurityContext()->GetSecurityOrigin()); | 435 GetFrame()->GetSecurityContext()->GetSecurityOrigin()); |
| 434 } | 436 } |
| 435 GetFrame()->GetSecurityContext()->InitializeFeaturePolicy( | 437 GetFrame()->GetSecurityContext()->InitializeFeaturePolicy( |
| 436 parsed_header, container_policy, parent_feature_policy); | 438 parsed_header, container_policy, parent_feature_policy); |
| 437 } | 439 } |
| 438 } | 440 } |
| 439 | 441 |
| 440 void WebRemoteFrameImpl::AddReplicatedContentSecurityPolicyHeader( | 442 void WebRemoteFrameImpl::AddReplicatedContentSecurityPolicyHeader( |
| 441 const WebString& header_value, | 443 const WebString& header_value, |
| 442 WebContentSecurityPolicyType type, | 444 WebContentSecurityPolicyType type, |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 } | 537 } |
| 536 | 538 |
| 537 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, | 539 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, |
| 538 WebRemoteFrameClient* client) | 540 WebRemoteFrameClient* client) |
| 539 : WebRemoteFrame(scope), | 541 : WebRemoteFrame(scope), |
| 540 frame_client_(RemoteFrameClientImpl::Create(this)), | 542 frame_client_(RemoteFrameClientImpl::Create(this)), |
| 541 client_(client), | 543 client_(client), |
| 542 self_keep_alive_(this) {} | 544 self_keep_alive_(this) {} |
| 543 | 545 |
| 544 } // namespace blink | 546 } // namespace blink |
| OLD | NEW |