| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index fadeeca42041cb03120150ffe39978fa7c35804d..8f4afc31b8ec67634282efa3b3357e6a36365b97 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -54,6 +54,7 @@
|
| #include "content/browser/webui/web_ui_controller_factory_registry.h"
|
| #include "content/common/accessibility_messages.h"
|
| #include "content/common/frame_messages.h"
|
| +#include "content/common/frame_owner_properties.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/inter_process_time_ticks_converter.h"
|
| #include "content/common/navigation_params.h"
|
| @@ -808,7 +809,8 @@ bool RenderFrameHostImpl::CreateRenderFrame(int proxy_routing_id,
|
| params.replication_state.sandbox_flags =
|
| frame_tree_node()->pending_sandbox_flags();
|
|
|
| - params.frame_owner_properties = frame_tree_node()->frame_owner_properties();
|
| + params.frame_owner_properties =
|
| + FrameOwnerProperties(frame_tree_node()->frame_owner_properties());
|
|
|
| if (render_widget_host_) {
|
| params.widget_params.routing_id = render_widget_host_->GetRoutingID();
|
| @@ -1658,15 +1660,18 @@ void RenderFrameHostImpl::OnDidChangeSandboxFlags(
|
|
|
| void RenderFrameHostImpl::OnDidChangeFrameOwnerProperties(
|
| int32_t frame_routing_id,
|
| - const blink::WebFrameOwnerProperties& properties) {
|
| + const FrameOwnerProperties& properties) {
|
| FrameTreeNode* child = FindAndVerifyChild(
|
| frame_routing_id, bad_message::RFH_OWNER_PROPERTY);
|
| if (!child)
|
| return;
|
|
|
| - child->set_frame_owner_properties(properties);
|
| + blink::WebFrameOwnerProperties web_properties =
|
| + properties.ToWebFrameOwnerProperties();
|
|
|
| - child->render_manager()->OnDidUpdateFrameOwnerProperties(properties);
|
| + child->set_frame_owner_properties(web_properties);
|
| +
|
| + child->render_manager()->OnDidUpdateFrameOwnerProperties(web_properties);
|
| }
|
|
|
| void RenderFrameHostImpl::OnUpdateTitle(
|
|
|