Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3115 Send(new FrameHostMsg_UpdateToUniqueOrigin( | 3115 Send(new FrameHostMsg_UpdateToUniqueOrigin( |
| 3116 routing_id_, is_potentially_trustworthy_unique_origin)); | 3116 routing_id_, is_potentially_trustworthy_unique_origin)); |
| 3117 } | 3117 } |
| 3118 | 3118 |
| 3119 void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame, | 3119 void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame, |
| 3120 blink::WebSandboxFlags flags) { | 3120 blink::WebSandboxFlags flags) { |
| 3121 Send(new FrameHostMsg_DidChangeSandboxFlags( | 3121 Send(new FrameHostMsg_DidChangeSandboxFlags( |
| 3122 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); | 3122 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); |
| 3123 } | 3123 } |
| 3124 | 3124 |
| 3125 void RenderFrameImpl::didSetFeaturePolicyHeader( | |
| 3126 const blink::WebString& header_value) { | |
| 3127 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | |
| 3128 return; | |
|
raymes
2016/11/07 23:10:25
Hmm - we will want this to be replicated to the br
iclelland
2016/11/08 03:13:41
That's a good point - once we start using it for b
alexmos
2016/11/09 01:16:55
I'd say just remove this now.
AreCrossProcessFr
iclelland
2016/11/09 18:07:59
Done, make sense. Thanks.
| |
| 3129 Send(new FrameHostMsg_DidSetFeaturePolicyHeader( | |
| 3130 routing_id_, base::UTF16ToUTF8(base::StringPiece16(header_value)))); | |
| 3131 } | |
| 3132 | |
| 3125 void RenderFrameImpl::didAddContentSecurityPolicy( | 3133 void RenderFrameImpl::didAddContentSecurityPolicy( |
| 3126 const blink::WebString& header_value, | 3134 const blink::WebString& header_value, |
| 3127 blink::WebContentSecurityPolicyType type, | 3135 blink::WebContentSecurityPolicyType type, |
| 3128 blink::WebContentSecurityPolicySource source) { | 3136 blink::WebContentSecurityPolicySource source) { |
| 3129 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 3137 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
| 3130 return; | 3138 return; |
| 3131 | 3139 |
| 3132 ContentSecurityPolicyHeader header; | 3140 ContentSecurityPolicyHeader header; |
| 3133 header.header_value = base::UTF16ToUTF8(base::StringPiece16(header_value)); | 3141 header.header_value = base::UTF16ToUTF8(base::StringPiece16(header_value)); |
| 3134 header.type = type; | 3142 header.type = type; |
| (...skipping 3439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6574 // event target. Potentially a Pepper plugin will receive the event. | 6582 // event target. Potentially a Pepper plugin will receive the event. |
| 6575 // In order to tell whether a plugin gets the last mouse event and which it | 6583 // In order to tell whether a plugin gets the last mouse event and which it |
| 6576 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6584 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6577 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6585 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6578 // |pepper_last_mouse_event_target_|. | 6586 // |pepper_last_mouse_event_target_|. |
| 6579 pepper_last_mouse_event_target_ = nullptr; | 6587 pepper_last_mouse_event_target_ = nullptr; |
| 6580 #endif | 6588 #endif |
| 6581 } | 6589 } |
| 6582 | 6590 |
| 6583 } // namespace content | 6591 } // namespace content |
| OLD | NEW |