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 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "content/child/web_url_request_util.h" | 13 #include "content/child/web_url_request_util.h" |
14 #include "content/child/webmessageportchannel_impl.h" | 14 #include "content/child/webmessageportchannel_impl.h" |
15 #include "content/common/content_security_policy_header.h" | 15 #include "content/common/content_security_policy_header.h" |
16 #include "content/common/frame_messages.h" | 16 #include "content/common/frame_messages.h" |
| 17 #include "content/common/frame_owner_properties.h" |
17 #include "content/common/frame_replication_state.h" | 18 #include "content/common/frame_replication_state.h" |
18 #include "content/common/input_messages.h" | 19 #include "content/common/input_messages.h" |
19 #include "content/common/page_messages.h" | 20 #include "content/common/page_messages.h" |
20 #include "content/common/site_isolation_policy.h" | 21 #include "content/common/site_isolation_policy.h" |
21 #include "content/common/swapped_out_messages.h" | 22 #include "content/common/swapped_out_messages.h" |
22 #include "content/common/view_messages.h" | 23 #include "content/common/view_messages.h" |
23 #include "content/renderer/child_frame_compositing_helper.h" | 24 #include "content/renderer/child_frame_compositing_helper.h" |
24 #include "content/renderer/render_frame_impl.h" | 25 #include "content/renderer/render_frame_impl.h" |
25 #include "content/renderer/render_thread_impl.h" | 26 #include "content/renderer/render_thread_impl.h" |
26 #include "content/renderer/render_view_impl.h" | 27 #include "content/renderer/render_view_impl.h" |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 void RenderFrameProxy::OnResetContentSecurityPolicy() { | 351 void RenderFrameProxy::OnResetContentSecurityPolicy() { |
351 web_frame_->resetReplicatedContentSecurityPolicy(); | 352 web_frame_->resetReplicatedContentSecurityPolicy(); |
352 } | 353 } |
353 | 354 |
354 void RenderFrameProxy::OnEnforceInsecureRequestPolicy( | 355 void RenderFrameProxy::OnEnforceInsecureRequestPolicy( |
355 blink::WebInsecureRequestPolicy policy) { | 356 blink::WebInsecureRequestPolicy policy) { |
356 web_frame_->setReplicatedInsecureRequestPolicy(policy); | 357 web_frame_->setReplicatedInsecureRequestPolicy(policy); |
357 } | 358 } |
358 | 359 |
359 void RenderFrameProxy::OnSetFrameOwnerProperties( | 360 void RenderFrameProxy::OnSetFrameOwnerProperties( |
360 const blink::WebFrameOwnerProperties& properties) { | 361 const FrameOwnerProperties& properties) { |
361 web_frame_->setFrameOwnerProperties(properties); | 362 web_frame_->setFrameOwnerProperties(properties.ToWebFrameOwnerProperties()); |
362 } | 363 } |
363 | 364 |
364 void RenderFrameProxy::OnDidUpdateOrigin( | 365 void RenderFrameProxy::OnDidUpdateOrigin( |
365 const url::Origin& origin, | 366 const url::Origin& origin, |
366 bool is_potentially_trustworthy_unique_origin) { | 367 bool is_potentially_trustworthy_unique_origin) { |
367 web_frame_->setReplicatedOrigin(origin); | 368 web_frame_->setReplicatedOrigin(origin); |
368 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( | 369 web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin( |
369 is_potentially_trustworthy_unique_origin); | 370 is_potentially_trustworthy_unique_origin); |
370 } | 371 } |
371 | 372 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 blink::WebLocalFrame* source) { | 494 blink::WebLocalFrame* source) { |
494 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); | 495 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); |
495 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); | 496 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); |
496 } | 497 } |
497 | 498 |
498 void RenderFrameProxy::frameFocused() { | 499 void RenderFrameProxy::frameFocused() { |
499 Send(new FrameHostMsg_FrameFocused(routing_id_)); | 500 Send(new FrameHostMsg_FrameFocused(routing_id_)); |
500 } | 501 } |
501 | 502 |
502 } // namespace | 503 } // namespace |
OLD | NEW |