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...) Expand 10 before | Expand all | Expand 10 after 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 "platform/wtf/PtrUtil.h" | 77 #include "platform/wtf/PtrUtil.h" |
77 #include "platform/wtf/StringExtras.h" | 78 #include "platform/wtf/StringExtras.h" |
78 #include "platform/wtf/text/CString.h" | 79 #include "platform/wtf/text/CString.h" |
79 #include "platform/wtf/text/WTFString.h" | 80 #include "platform/wtf/text/WTFString.h" |
80 #include "public/platform/Platform.h" | 81 #include "public/platform/Platform.h" |
81 #include "public/platform/WebApplicationCacheHost.h" | 82 #include "public/platform/WebApplicationCacheHost.h" |
82 #include "public/platform/WebMediaPlayerSource.h" | 83 #include "public/platform/WebMediaPlayerSource.h" |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
831 } | 832 } |
832 | 833 |
833 void LocalFrameClientImpl::DidUpdateToUniqueOrigin() { | 834 void LocalFrameClientImpl::DidUpdateToUniqueOrigin() { |
834 if (!web_frame_->Client()) | 835 if (!web_frame_->Client()) |
835 return; | 836 return; |
836 DCHECK(web_frame_->GetSecurityOrigin().IsUnique()); | 837 DCHECK(web_frame_->GetSecurityOrigin().IsUnique()); |
837 web_frame_->Client()->DidUpdateToUniqueOrigin( | 838 web_frame_->Client()->DidUpdateToUniqueOrigin( |
838 web_frame_->GetSecurityOrigin().IsPotentiallyTrustworthy()); | 839 web_frame_->GetSecurityOrigin().IsPotentiallyTrustworthy()); |
839 } | 840 } |
840 | 841 |
841 void LocalFrameClientImpl::DidChangeSandboxFlags(Frame* child_frame, | 842 void LocalFrameClientImpl::DidChangeFramePolicy( |
842 SandboxFlags flags) { | 843 Frame* child_frame, |
| 844 SandboxFlags flags, |
| 845 const WebParsedFeaturePolicy& container_policy) { |
843 if (!web_frame_->Client()) | 846 if (!web_frame_->Client()) |
844 return; | 847 return; |
845 web_frame_->Client()->DidChangeSandboxFlags( | 848 web_frame_->Client()->DidChangeFramePolicy( |
846 WebFrame::FromFrame(child_frame), static_cast<WebSandboxFlags>(flags)); | 849 WebFrame::FromFrame(child_frame), static_cast<WebSandboxFlags>(flags), |
| 850 container_policy); |
847 } | 851 } |
848 | 852 |
849 void LocalFrameClientImpl::DidSetFeaturePolicyHeader( | 853 void LocalFrameClientImpl::DidSetFeaturePolicyHeader( |
850 const WebParsedFeaturePolicy& parsed_header) { | 854 const WebParsedFeaturePolicy& parsed_header) { |
851 if (web_frame_->Client()) | 855 if (web_frame_->Client()) |
852 web_frame_->Client()->DidSetFeaturePolicyHeader(parsed_header); | 856 web_frame_->Client()->DidSetFeaturePolicyHeader(parsed_header); |
853 } | 857 } |
854 | 858 |
855 void LocalFrameClientImpl::DidAddContentSecurityPolicies( | 859 void LocalFrameClientImpl::DidAddContentSecurityPolicies( |
856 const blink::WebVector<WebContentSecurityPolicy>& policies) { | 860 const blink::WebVector<WebContentSecurityPolicy>& policies) { |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
972 void LocalFrameClientImpl::AbortClientNavigation() { | 976 void LocalFrameClientImpl::AbortClientNavigation() { |
973 if (web_frame_->Client()) | 977 if (web_frame_->Client()) |
974 web_frame_->Client()->AbortClientNavigation(); | 978 web_frame_->Client()->AbortClientNavigation(); |
975 } | 979 } |
976 | 980 |
977 TextCheckerClient& LocalFrameClientImpl::GetTextCheckerClient() const { | 981 TextCheckerClient& LocalFrameClientImpl::GetTextCheckerClient() const { |
978 return web_frame_->GetTextCheckerClient(); | 982 return web_frame_->GetTextCheckerClient(); |
979 } | 983 } |
980 | 984 |
981 } // namespace blink | 985 } // namespace blink |
OLD | NEW |