OLD | NEW |
---|---|
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 | 219 |
220 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { | 220 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) { |
221 DCHECK(web_frame_); | 221 DCHECK(web_frame_); |
222 web_frame_->setReplicatedOrigin(state.origin); | 222 web_frame_->setReplicatedOrigin(state.origin); |
223 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); | 223 web_frame_->setReplicatedSandboxFlags(state.sandbox_flags); |
224 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name), | 224 web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name), |
225 blink::WebString::fromUTF8(state.unique_name)); | 225 blink::WebString::fromUTF8(state.unique_name)); |
226 web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy); | 226 web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy); |
227 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( | 227 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( |
228 state.has_potentially_trustworthy_unique_origin); | 228 state.has_potentially_trustworthy_unique_origin); |
229 web_frame_->resetReplicatedContentSecurityPolicy(); | |
raymes
2016/11/07 02:16:01
This calls the wrong thing by the looks of it!
iclelland
2016/11/07 03:37:03
Quite likely :) This is all very very WIP; not nea
| |
230 for (const auto& header : state.feature_policy_headers) | |
231 web_frame_->addReplicatedFeaturePolicyHeader( | |
raymes
2016/11/07 02:16:01
Similarly here, I think we could just get rid of t
iclelland
2016/11/07 03:37:03
Agreed. Since the headers are already fully receiv
| |
232 blink::WebString::fromUTF8(header)); | |
229 | 233 |
230 web_frame_->resetReplicatedContentSecurityPolicy(); | 234 web_frame_->resetReplicatedContentSecurityPolicy(); |
231 for (const auto& header : state.accumulated_csp_headers) | 235 for (const auto& header : state.accumulated_csp_headers) |
232 OnAddContentSecurityPolicy(header); | 236 OnAddContentSecurityPolicy(header); |
233 } | 237 } |
234 | 238 |
235 // Update the proxy's SecurityContext and FrameOwner with new sandbox flags | 239 // Update the proxy's SecurityContext and FrameOwner with new sandbox flags |
236 // that were set by its parent in another process. | 240 // that were set by its parent in another process. |
237 // | 241 // |
238 // Normally, when a frame's sandbox attribute is changed dynamically, the | 242 // Normally, when a frame's sandbox attribute is changed dynamically, the |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
507 blink::WebLocalFrame* source) { | 511 blink::WebLocalFrame* source) { |
508 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); | 512 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); |
509 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); | 513 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); |
510 } | 514 } |
511 | 515 |
512 void RenderFrameProxy::frameFocused() { | 516 void RenderFrameProxy::frameFocused() { |
513 Send(new FrameHostMsg_FrameFocused(routing_id_)); | 517 Send(new FrameHostMsg_FrameFocused(routing_id_)); |
514 } | 518 } |
515 | 519 |
516 } // namespace | 520 } // namespace |
OLD | NEW |