| 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 <v8/include/v8.h> |
| 7 #include "core/dom/Fullscreen.h" | 8 #include "core/dom/Fullscreen.h" |
| 8 #include "core/dom/RemoteSecurityContext.h" | 9 #include "core/dom/RemoteSecurityContext.h" |
| 9 #include "core/dom/SecurityContext.h" | 10 #include "core/dom/SecurityContext.h" |
| 10 #include "core/frame/FrameView.h" | 11 #include "core/frame/FrameView.h" |
| 11 #include "core/frame/Settings.h" | 12 #include "core/frame/Settings.h" |
| 12 #include "core/frame/csp/ContentSecurityPolicy.h" | 13 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 13 #include "core/html/HTMLFrameOwnerElement.h" | 14 #include "core/html/HTMLFrameOwnerElement.h" |
| 14 #include "core/layout/LayoutObject.h" | 15 #include "core/layout/LayoutObject.h" |
| 15 #include "core/page/Page.h" | 16 #include "core/page/Page.h" |
| 16 #include "platform/heap/Handle.h" | 17 #include "platform/heap/Handle.h" |
| 18 #include "public/platform/WebFeaturePolicy.h" |
| 17 #include "public/platform/WebFloatRect.h" | 19 #include "public/platform/WebFloatRect.h" |
| 18 #include "public/platform/WebRect.h" | 20 #include "public/platform/WebRect.h" |
| 19 #include "public/web/WebDocument.h" | 21 #include "public/web/WebDocument.h" |
| 20 #include "public/web/WebFrameOwnerProperties.h" | 22 #include "public/web/WebFrameOwnerProperties.h" |
| 21 #include "public/web/WebPerformance.h" | 23 #include "public/web/WebPerformance.h" |
| 22 #include "public/web/WebRange.h" | 24 #include "public/web/WebRange.h" |
| 23 #include "public/web/WebTreeScopeType.h" | 25 #include "public/web/WebTreeScopeType.h" |
| 24 #include "web/RemoteFrameOwner.h" | 26 #include "web/RemoteFrameOwner.h" |
| 25 #include "web/WebLocalFrameImpl.h" | 27 #include "web/WebLocalFrameImpl.h" |
| 26 #include "web/WebViewImpl.h" | 28 #include "web/WebViewImpl.h" |
| 27 #include <v8/include/v8.h> | |
| 28 | 29 |
| 29 namespace blink { | 30 namespace blink { |
| 30 | 31 |
| 31 WebRemoteFrame* WebRemoteFrame::create(WebTreeScopeType scope, | 32 WebRemoteFrame* WebRemoteFrame::create(WebTreeScopeType scope, |
| 32 WebRemoteFrameClient* client, | 33 WebRemoteFrameClient* client, |
| 33 WebFrame* opener) { | 34 WebFrame* opener) { |
| 34 return WebRemoteFrameImpl::create(scope, client, opener); | 35 return WebRemoteFrameImpl::create(scope, client, opener); |
| 35 } | 36 } |
| 36 | 37 |
| 37 WebRemoteFrameImpl* WebRemoteFrameImpl::create(WebTreeScopeType scope, | 38 WebRemoteFrameImpl* WebRemoteFrameImpl::create(WebTreeScopeType scope, |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 | 422 |
| 422 void WebRemoteFrameImpl::setReplicatedName(const WebString& name, | 423 void WebRemoteFrameImpl::setReplicatedName(const WebString& name, |
| 423 const WebString& uniqueName) const { | 424 const WebString& uniqueName) const { |
| 424 DCHECK(frame()); | 425 DCHECK(frame()); |
| 425 frame()->tree().setPrecalculatedName(name, uniqueName); | 426 frame()->tree().setPrecalculatedName(name, uniqueName); |
| 426 } | 427 } |
| 427 | 428 |
| 428 void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader( | 429 void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader( |
| 429 const WebParsedFeaturePolicyHeader& parsedHeader) const { | 430 const WebParsedFeaturePolicyHeader& parsedHeader) const { |
| 430 if (RuntimeEnabledFeatures::featurePolicyEnabled()) { | 431 if (RuntimeEnabledFeatures::featurePolicyEnabled()) { |
| 431 FeaturePolicy* parentFeaturePolicy = nullptr; | 432 WebFeaturePolicy* parentFeaturePolicy = nullptr; |
| 432 if (parent()) { | 433 if (parent()) { |
| 433 Frame* parentFrame = frame()->client()->parent(); | 434 Frame* parentFrame = frame()->client()->parent(); |
| 434 parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy(); | 435 parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy(); |
| 435 } | 436 } |
| 436 frame()->securityContext()->setFeaturePolicyFromHeader(parsedHeader, | 437 frame()->securityContext()->initializeFeaturePolicy(parsedHeader, |
| 437 parentFeaturePolicy); | 438 parentFeaturePolicy); |
| 438 } | 439 } |
| 439 } | 440 } |
| 440 | 441 |
| 441 void WebRemoteFrameImpl::addReplicatedContentSecurityPolicyHeader( | 442 void WebRemoteFrameImpl::addReplicatedContentSecurityPolicyHeader( |
| 442 const WebString& headerValue, | 443 const WebString& headerValue, |
| 443 WebContentSecurityPolicyType type, | 444 WebContentSecurityPolicyType type, |
| 444 WebContentSecurityPolicySource source) const { | 445 WebContentSecurityPolicySource source) const { |
| 445 frame()->securityContext()->contentSecurityPolicy()->addPolicyFromHeaderValue( | 446 frame()->securityContext()->contentSecurityPolicy()->addPolicyFromHeaderValue( |
| 446 headerValue, static_cast<ContentSecurityPolicyHeaderType>(type), | 447 headerValue, static_cast<ContentSecurityPolicyHeaderType>(type), |
| 447 static_cast<ContentSecurityPolicyHeaderSource>(source)); | 448 static_cast<ContentSecurityPolicyHeaderSource>(source)); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 527 } | 528 } |
| 528 | 529 |
| 529 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, | 530 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, |
| 530 WebRemoteFrameClient* client) | 531 WebRemoteFrameClient* client) |
| 531 : WebRemoteFrame(scope), | 532 : WebRemoteFrame(scope), |
| 532 m_frameClient(RemoteFrameClientImpl::create(this)), | 533 m_frameClient(RemoteFrameClientImpl::create(this)), |
| 533 m_client(client), | 534 m_client(client), |
| 534 m_selfKeepAlive(this) {} | 535 m_selfKeepAlive(this) {} |
| 535 | 536 |
| 536 } // namespace blink | 537 } // namespace blink |
| OLD | NEW |