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

Side by Side Diff: content/renderer/render_frame_proxy.cc

Issue 2653043002: Fix Feature Policy header replication in site-isolation. (Closed)
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/FlagExpectations/site-per-process » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const ParsedFeaturePolicy& parsed_whitelists) { 53 const ParsedFeaturePolicy& parsed_whitelists) {
54 std::vector<blink::WebFeaturePolicy::ParsedWhitelist> result; 54 std::vector<blink::WebFeaturePolicy::ParsedWhitelist> result;
55 for (const FeaturePolicyParsedWhitelist& whitelist : parsed_whitelists) { 55 for (const FeaturePolicyParsedWhitelist& whitelist : parsed_whitelists) {
56 blink::WebFeaturePolicy::ParsedWhitelist web_whitelist; 56 blink::WebFeaturePolicy::ParsedWhitelist web_whitelist;
57 web_whitelist.featureName = 57 web_whitelist.featureName =
58 blink::WebString::fromUTF8(whitelist.feature_name); 58 blink::WebString::fromUTF8(whitelist.feature_name);
59 web_whitelist.matchesAllOrigins = whitelist.matches_all_origins; 59 web_whitelist.matchesAllOrigins = whitelist.matches_all_origins;
60 std::vector<blink::WebSecurityOrigin> web_origins; 60 std::vector<blink::WebSecurityOrigin> web_origins;
61 for (const url::Origin& origin : whitelist.origins) 61 for (const url::Origin& origin : whitelist.origins)
62 web_origins.push_back(origin); 62 web_origins.push_back(origin);
63 web_whitelist.origins = web_origins;
63 result.push_back(web_whitelist); 64 result.push_back(web_whitelist);
64 } 65 }
65 return result; 66 return result;
66 } 67 }
67 68
68 } // namespace 69 } // namespace
69 70
70 // static 71 // static
71 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame( 72 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
72 RenderFrameImpl* frame_to_replace, 73 RenderFrameImpl* frame_to_replace,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 blink::WebLocalFrame* source) { 532 blink::WebLocalFrame* source) {
532 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 533 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
533 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 534 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
534 } 535 }
535 536
536 void RenderFrameProxy::frameFocused() { 537 void RenderFrameProxy::frameFocused() {
537 Send(new FrameHostMsg_FrameFocused(routing_id_)); 538 Send(new FrameHostMsg_FrameFocused(routing_id_));
538 } 539 }
539 540
540 } // namespace 541 } // namespace
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/FlagExpectations/site-per-process » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698