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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2654873004: Move content-side Feature Policy code into content/{common,child}/feature_policy (Closed)
Patch Set: Fix missed nit Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/frame_replication_state.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 15148edb04750c85efdb47b156e355c98e38b3f2..dfd314cf7343290a9f04fd6e53069ba4d6a9056d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -36,6 +36,7 @@
#include "build/build_config.h"
#include "cc/base/switches.h"
#include "content/child/appcache/appcache_dispatcher.h"
+#include "content/child/feature_policy/feature_policy_platform.h"
#include "content/child/quota_dispatcher.h"
#include "content/child/request_extra_data.h"
#include "content/child/service_worker/service_worker_handle_reference.h"
@@ -874,21 +875,6 @@ double ConvertToBlinkTime(const base::TimeTicks& time_ticks) {
return (time_ticks - base::TimeTicks()).InSecondsF();
}
-ParsedFeaturePolicyHeader ToParsedFeaturePolicyHeader(
- const blink::WebParsedFeaturePolicyHeader& parsed_header) {
- ParsedFeaturePolicyHeader result;
- for (const blink::WebParsedFeaturePolicyDeclaration& web_declaration :
- parsed_header) {
- ParsedFeaturePolicyDeclaration declaration;
- declaration.feature_name = web_declaration.featureName.utf8();
- declaration.matches_all_origins = web_declaration.matchesAllOrigins;
- for (const blink::WebSecurityOrigin& web_origin : web_declaration.origins)
- declaration.origins.push_back(web_origin);
- result.push_back(declaration);
- }
- return result;
-}
-
} // namespace
struct RenderFrameImpl::PendingFileChooser {
@@ -3198,7 +3184,7 @@ void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame,
void RenderFrameImpl::didSetFeaturePolicyHeader(
const blink::WebParsedFeaturePolicyHeader& parsed_header) {
Send(new FrameHostMsg_DidSetFeaturePolicyHeader(
- routing_id_, ToParsedFeaturePolicyHeader(parsed_header)));
+ routing_id_, FeaturePolicyHeaderFromWeb(parsed_header)));
}
void RenderFrameImpl::didAddContentSecurityPolicy(
« no previous file with comments | « content/common/frame_replication_state.cc ('k') | content/renderer/render_frame_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698