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

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

Issue 2764993002: CSP: group policies in didAddContentSecurityPolicy. (Closed)
Patch Set: Nit. 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 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 m_webFrame->client()->didChangeSandboxFlags( 909 m_webFrame->client()->didChangeSandboxFlags(
910 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags)); 910 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags));
911 } 911 }
912 912
913 void LocalFrameClientImpl::didSetFeaturePolicyHeader( 913 void LocalFrameClientImpl::didSetFeaturePolicyHeader(
914 const WebParsedFeaturePolicy& parsedHeader) { 914 const WebParsedFeaturePolicy& parsedHeader) {
915 if (m_webFrame->client()) 915 if (m_webFrame->client())
916 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); 916 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader);
917 } 917 }
918 918
919 void LocalFrameClientImpl::didAddContentSecurityPolicy( 919 void LocalFrameClientImpl::didAddContentSecurityPolicies(
920 const String& headerValue, 920 const blink::WebVector<WebContentSecurityPolicyPolicy>& policies) {
921 ContentSecurityPolicyHeaderType type, 921 if (m_webFrame->client())
922 ContentSecurityPolicyHeaderSource source, 922 m_webFrame->client()->didAddContentSecurityPolicies(policies);
923 const std::vector<WebContentSecurityPolicyPolicy>& policies) {
924 if (m_webFrame->client()) {
925 m_webFrame->client()->didAddContentSecurityPolicy(
926 headerValue, static_cast<WebContentSecurityPolicyType>(type),
927 static_cast<WebContentSecurityPolicySource>(source), policies);
928 }
929 } 923 }
930 924
931 void LocalFrameClientImpl::didChangeFrameOwnerProperties( 925 void LocalFrameClientImpl::didChangeFrameOwnerProperties(
932 HTMLFrameElementBase* frameElement) { 926 HTMLFrameElementBase* frameElement) {
933 if (!m_webFrame->client()) 927 if (!m_webFrame->client())
934 return; 928 return;
935 929
936 m_webFrame->client()->didChangeFrameOwnerProperties( 930 m_webFrame->client()->didChangeFrameOwnerProperties(
937 WebFrame::fromFrame(frameElement->contentFrame()), 931 WebFrame::fromFrame(frameElement->contentFrame()),
938 WebFrameOwnerProperties( 932 WebFrameOwnerProperties(
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 if (m_webFrame->client()) 1028 if (m_webFrame->client())
1035 m_webFrame->client()->setHasReceivedUserGesture(); 1029 m_webFrame->client()->setHasReceivedUserGesture();
1036 } 1030 }
1037 1031
1038 void LocalFrameClientImpl::abortClientNavigation() { 1032 void LocalFrameClientImpl::abortClientNavigation() {
1039 if (m_webFrame->client()) 1033 if (m_webFrame->client())
1040 m_webFrame->client()->abortClientNavigation(); 1034 m_webFrame->client()->abortClientNavigation();
1041 } 1035 }
1042 1036
1043 } // namespace blink 1037 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698