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

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

Issue 2764993002: CSP: group policies in didAddContentSecurityPolicy. (Closed)
Patch Set: Group the IPC instead of splitting them. (browser -> renderer) 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 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 m_webFrame->client()->didChangeSandboxFlags( 910 m_webFrame->client()->didChangeSandboxFlags(
911 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags)); 911 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags));
912 } 912 }
913 913
914 void LocalFrameClientImpl::didSetFeaturePolicyHeader( 914 void LocalFrameClientImpl::didSetFeaturePolicyHeader(
915 const WebParsedFeaturePolicy& parsedHeader) { 915 const WebParsedFeaturePolicy& parsedHeader) {
916 if (m_webFrame->client()) 916 if (m_webFrame->client())
917 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); 917 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader);
918 } 918 }
919 919
920 void LocalFrameClientImpl::didAddContentSecurityPolicy( 920 void LocalFrameClientImpl::didAddContentSecurityPolicies(
921 const String& headerValue, 921 const blink::WebVector<WebContentSecurityPolicyPolicy>& policies) {
922 ContentSecurityPolicyHeaderType type, 922 if (m_webFrame->client())
923 ContentSecurityPolicyHeaderSource source, 923 m_webFrame->client()->didAddContentSecurityPolicies(policies);
924 const std::vector<WebContentSecurityPolicyPolicy>& policies) {
925 if (m_webFrame->client()) {
926 m_webFrame->client()->didAddContentSecurityPolicy(
927 headerValue, static_cast<WebContentSecurityPolicyType>(type),
928 static_cast<WebContentSecurityPolicySource>(source), policies);
929 }
930 } 924 }
931 925
932 void LocalFrameClientImpl::didChangeFrameOwnerProperties( 926 void LocalFrameClientImpl::didChangeFrameOwnerProperties(
933 HTMLFrameElementBase* frameElement) { 927 HTMLFrameElementBase* frameElement) {
934 if (!m_webFrame->client()) 928 if (!m_webFrame->client())
935 return; 929 return;
936 930
937 m_webFrame->client()->didChangeFrameOwnerProperties( 931 m_webFrame->client()->didChangeFrameOwnerProperties(
938 WebFrame::fromFrame(frameElement->contentFrame()), 932 WebFrame::fromFrame(frameElement->contentFrame()),
939 WebFrameOwnerProperties( 933 WebFrameOwnerProperties(
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 1024 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
1031 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1025 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1032 } 1026 }
1033 1027
1034 void LocalFrameClientImpl::setHasReceivedUserGesture() { 1028 void LocalFrameClientImpl::setHasReceivedUserGesture() {
1035 if (m_webFrame->client()) 1029 if (m_webFrame->client())
1036 m_webFrame->client()->setHasReceivedUserGesture(); 1030 m_webFrame->client()->setHasReceivedUserGesture();
1037 } 1031 }
1038 1032
1039 } // namespace blink 1033 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698