Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Side by Side Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 2739203002: Initial Implementation of Iframe Attribute for Feature Policy (Part 3) (Closed)
Patch Set: Bug fix: frame owner does not always exist. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "core/dom/SecurityContext.h" 11 #include "core/dom/SecurityContext.h"
12 #include "core/frame/FrameView.h" 12 #include "core/frame/FrameView.h"
13 #include "core/frame/Settings.h" 13 #include "core/frame/Settings.h"
14 #include "core/frame/csp/ContentSecurityPolicy.h" 14 #include "core/frame/csp/ContentSecurityPolicy.h"
15 #include "core/html/HTMLFrameOwnerElement.h" 15 #include "core/html/HTMLFrameOwnerElement.h"
16 #include "core/layout/LayoutObject.h" 16 #include "core/layout/LayoutObject.h"
17 #include "core/page/Page.h" 17 #include "core/page/Page.h"
18 #include "platform/feature_policy/FeaturePolicy.h"
18 #include "platform/heap/Handle.h" 19 #include "platform/heap/Handle.h"
19 #include "public/platform/WebFeaturePolicy.h" 20 #include "public/platform/WebFeaturePolicy.h"
20 #include "public/platform/WebFloatRect.h" 21 #include "public/platform/WebFloatRect.h"
21 #include "public/platform/WebRect.h" 22 #include "public/platform/WebRect.h"
22 #include "public/web/WebDocument.h" 23 #include "public/web/WebDocument.h"
23 #include "public/web/WebFrameOwnerProperties.h" 24 #include "public/web/WebFrameOwnerProperties.h"
24 #include "public/web/WebPerformance.h" 25 #include "public/web/WebPerformance.h"
25 #include "public/web/WebRange.h" 26 #include "public/web/WebRange.h"
26 #include "public/web/WebTreeScopeType.h" 27 #include "public/web/WebTreeScopeType.h"
27 #include "v8/include/v8.h" 28 #include "v8/include/v8.h"
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 } 425 }
425 426
426 void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader( 427 void WebRemoteFrameImpl::setReplicatedFeaturePolicyHeader(
427 const WebParsedFeaturePolicy& parsedHeader) const { 428 const WebParsedFeaturePolicy& parsedHeader) const {
428 if (RuntimeEnabledFeatures::featurePolicyEnabled()) { 429 if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
429 WebFeaturePolicy* parentFeaturePolicy = nullptr; 430 WebFeaturePolicy* parentFeaturePolicy = nullptr;
430 if (parent()) { 431 if (parent()) {
431 Frame* parentFrame = frame()->client()->parent(); 432 Frame* parentFrame = frame()->client()->parent();
432 parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy(); 433 parentFeaturePolicy = parentFrame->securityContext()->getFeaturePolicy();
433 } 434 }
434 frame()->securityContext()->initializeFeaturePolicy(parsedHeader, 435 WebParsedFeaturePolicy containerPolicy;
435 parentFeaturePolicy); 436 if (frame() && frame()->owner()) {
437 containerPolicy = getContainerPolicyFromAllowedFeatures(
438 frame()->owner()->allowedFeatures(),
439 frame()->securityContext()->getSecurityOrigin());
440 }
441 frame()->securityContext()->initializeFeaturePolicy(
442 parsedHeader, containerPolicy, parentFeaturePolicy);
436 } 443 }
437 } 444 }
438 445
439 void WebRemoteFrameImpl::addReplicatedContentSecurityPolicyHeader( 446 void WebRemoteFrameImpl::addReplicatedContentSecurityPolicyHeader(
440 const WebString& headerValue, 447 const WebString& headerValue,
441 WebContentSecurityPolicyType type, 448 WebContentSecurityPolicyType type,
442 WebContentSecurityPolicySource source) const { 449 WebContentSecurityPolicySource source) const {
443 frame()->securityContext()->contentSecurityPolicy()->addPolicyFromHeaderValue( 450 frame()->securityContext()->contentSecurityPolicy()->addPolicyFromHeaderValue(
444 headerValue, static_cast<ContentSecurityPolicyHeaderType>(type), 451 headerValue, static_cast<ContentSecurityPolicyHeaderType>(type),
445 static_cast<ContentSecurityPolicyHeaderSource>(source)); 452 static_cast<ContentSecurityPolicyHeaderSource>(source));
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 538 }
532 539
533 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope, 540 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
534 WebRemoteFrameClient* client) 541 WebRemoteFrameClient* client)
535 : WebRemoteFrame(scope), 542 : WebRemoteFrame(scope),
536 m_frameClient(RemoteFrameClientImpl::create(this)), 543 m_frameClient(RemoteFrameClientImpl::create(this)),
537 m_client(client), 544 m_client(client),
538 m_selfKeepAlive(this) {} 545 m_selfKeepAlive(this) {}
539 546
540 } // namespace blink 547 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698