OLD | NEW |
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 52 matching lines...) Loading... |
63 #include "modules/remoteplayback/RemotePlayback.h" | 63 #include "modules/remoteplayback/RemotePlayback.h" |
64 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 64 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
65 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" | 65 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" |
66 #include "modules/storage/DOMWindowStorageController.h" | 66 #include "modules/storage/DOMWindowStorageController.h" |
67 #include "modules/vr/NavigatorVR.h" | 67 #include "modules/vr/NavigatorVR.h" |
68 #include "platform/Histogram.h" | 68 #include "platform/Histogram.h" |
69 #include "platform/RuntimeEnabledFeatures.h" | 69 #include "platform/RuntimeEnabledFeatures.h" |
70 #include "platform/UserGestureIndicator.h" | 70 #include "platform/UserGestureIndicator.h" |
71 #include "platform/exported/WrappedResourceRequest.h" | 71 #include "platform/exported/WrappedResourceRequest.h" |
72 #include "platform/exported/WrappedResourceResponse.h" | 72 #include "platform/exported/WrappedResourceResponse.h" |
| 73 #include "platform/feature_policy/FeaturePolicy.h" |
73 #include "platform/network/HTTPParsers.h" | 74 #include "platform/network/HTTPParsers.h" |
74 #include "platform/network/mime/MIMETypeRegistry.h" | 75 #include "platform/network/mime/MIMETypeRegistry.h" |
75 #include "platform/plugins/PluginData.h" | 76 #include "platform/plugins/PluginData.h" |
76 #include "public/platform/Platform.h" | 77 #include "public/platform/Platform.h" |
77 #include "public/platform/WebApplicationCacheHost.h" | 78 #include "public/platform/WebApplicationCacheHost.h" |
78 #include "public/platform/WebMediaPlayerSource.h" | 79 #include "public/platform/WebMediaPlayerSource.h" |
79 #include "public/platform/WebRTCPeerConnectionHandler.h" | 80 #include "public/platform/WebRTCPeerConnectionHandler.h" |
80 #include "public/platform/WebSecurityOrigin.h" | 81 #include "public/platform/WebSecurityOrigin.h" |
81 #include "public/platform/WebURL.h" | 82 #include "public/platform/WebURL.h" |
82 #include "public/platform/WebURLError.h" | 83 #include "public/platform/WebURLError.h" |
(...skipping 814 matching lines...) Loading... |
897 } | 898 } |
898 | 899 |
899 void LocalFrameClientImpl::didUpdateToUniqueOrigin() { | 900 void LocalFrameClientImpl::didUpdateToUniqueOrigin() { |
900 if (!m_webFrame->client()) | 901 if (!m_webFrame->client()) |
901 return; | 902 return; |
902 DCHECK(m_webFrame->getSecurityOrigin().isUnique()); | 903 DCHECK(m_webFrame->getSecurityOrigin().isUnique()); |
903 m_webFrame->client()->didUpdateToUniqueOrigin( | 904 m_webFrame->client()->didUpdateToUniqueOrigin( |
904 m_webFrame->getSecurityOrigin().isPotentiallyTrustworthy()); | 905 m_webFrame->getSecurityOrigin().isPotentiallyTrustworthy()); |
905 } | 906 } |
906 | 907 |
907 void LocalFrameClientImpl::didChangeSandboxFlags(Frame* childFrame, | 908 void LocalFrameClientImpl::didChangeFramePolicy( |
908 SandboxFlags flags) { | 909 Frame* childFrame, |
| 910 SandboxFlags flags, |
| 911 const WebParsedFeaturePolicy& containerPolicy) { |
909 if (!m_webFrame->client()) | 912 if (!m_webFrame->client()) |
910 return; | 913 return; |
911 m_webFrame->client()->didChangeSandboxFlags( | 914 m_webFrame->client()->didChangeFramePolicy( |
912 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags)); | 915 WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags), |
| 916 containerPolicy); |
913 } | 917 } |
914 | 918 |
915 void LocalFrameClientImpl::didSetFeaturePolicyHeader( | 919 void LocalFrameClientImpl::didSetFeaturePolicyHeader( |
916 const WebParsedFeaturePolicy& parsedHeader) { | 920 const WebParsedFeaturePolicy& parsedHeader) { |
917 if (m_webFrame->client()) | 921 if (m_webFrame->client()) |
918 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); | 922 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); |
919 } | 923 } |
920 | 924 |
921 void LocalFrameClientImpl::didAddContentSecurityPolicies( | 925 void LocalFrameClientImpl::didAddContentSecurityPolicies( |
922 const blink::WebVector<WebContentSecurityPolicy>& policies) { | 926 const blink::WebVector<WebContentSecurityPolicy>& policies) { |
(...skipping 107 matching lines...) Loading... |
1030 if (m_webFrame->client()) | 1034 if (m_webFrame->client()) |
1031 m_webFrame->client()->setHasReceivedUserGesture(); | 1035 m_webFrame->client()->setHasReceivedUserGesture(); |
1032 } | 1036 } |
1033 | 1037 |
1034 void LocalFrameClientImpl::abortClientNavigation() { | 1038 void LocalFrameClientImpl::abortClientNavigation() { |
1035 if (m_webFrame->client()) | 1039 if (m_webFrame->client()) |
1036 m_webFrame->client()->abortClientNavigation(); | 1040 m_webFrame->client()->abortClientNavigation(); |
1037 } | 1041 } |
1038 | 1042 |
1039 } // namespace blink | 1043 } // namespace blink |
OLD | NEW |