| Index: content/common/frame_messages.h
|
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
|
| index 55597d5dc660e34af50fa1e7db9a6187765b70e1..7e6b4df88e329209a83111d0b84fc105dec90ff0 100644
|
| --- a/content/common/frame_messages.h
|
| +++ b/content/common/frame_messages.h
|
| @@ -376,6 +376,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::FrameReplicationState)
|
| IPC_STRUCT_TRAITS_MEMBER(origin)
|
| IPC_STRUCT_TRAITS_MEMBER(sandbox_flags)
|
| IPC_STRUCT_TRAITS_MEMBER(name)
|
| + IPC_STRUCT_TRAITS_MEMBER(unique_name)
|
| IPC_STRUCT_TRAITS_MEMBER(scope)
|
| IPC_STRUCT_TRAITS_MEMBER(should_enforce_strict_mixed_content_checking)
|
| IPC_STRUCT_TRAITS_END()
|
| @@ -516,6 +517,15 @@ IPC_STRUCT_BEGIN(FrameHostMsg_HittestData_Params)
|
| IPC_STRUCT_MEMBER(bool, ignored_for_hittest)
|
| IPC_STRUCT_END()
|
|
|
| +IPC_STRUCT_BEGIN(FrameHostMsg_CreateChildFrame_Params)
|
| + IPC_STRUCT_MEMBER(int32_t, parent_routing_id)
|
| + IPC_STRUCT_MEMBER(blink::WebTreeScopeType, scope)
|
| + IPC_STRUCT_MEMBER(std::string, frame_name)
|
| + IPC_STRUCT_MEMBER(std::string, frame_unique_name)
|
| + IPC_STRUCT_MEMBER(blink::WebSandboxFlags, sandbox_flags)
|
| + IPC_STRUCT_MEMBER(blink::WebFrameOwnerProperties, frame_owner_properties)
|
| +IPC_STRUCT_END()
|
| +
|
| #if defined(OS_MACOSX) || defined(OS_ANDROID)
|
| // This message is used for supporting popup menus on Mac OS X and Android using
|
| // native controls. See the FrameHostMsg_ShowPopup message.
|
| @@ -742,7 +752,9 @@ IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateSandboxFlags, blink::WebSandboxFlags)
|
|
|
| // Update a proxy's window.name property. Used when the frame's name is
|
| // changed in another process.
|
| -IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateName, std::string /* name */)
|
| +IPC_MESSAGE_ROUTED2(FrameMsg_DidUpdateName,
|
| + std::string /* name */,
|
| + std::string /* unique_name */)
|
|
|
| // Update a proxy's replicated enforcement of strict mixed content
|
| // checking. Used when the frame's mixed content setting is changed in
|
| @@ -870,14 +882,9 @@ IPC_MESSAGE_ROUTED4(FrameHostMsg_AddMessageToConsole,
|
| //
|
| // Each of these messages will have a corresponding FrameHostMsg_Detach message
|
| // sent when the frame is detached from the DOM.
|
| -IPC_SYNC_MESSAGE_CONTROL5_1(
|
| - FrameHostMsg_CreateChildFrame,
|
| - int32_t /* parent_routing_id */,
|
| - blink::WebTreeScopeType /* scope */,
|
| - std::string /* frame_name */,
|
| - blink::WebSandboxFlags /* sandbox flags */,
|
| - blink::WebFrameOwnerProperties /* frame_owner_properties */,
|
| - int32_t /* new_routing_id */)
|
| +IPC_SYNC_MESSAGE_CONTROL1_1(FrameHostMsg_CreateChildFrame,
|
| + FrameHostMsg_CreateChildFrame_Params,
|
| + int32_t /* new_routing_id */)
|
|
|
| // Sent by the renderer to the parent RenderFrameHost when a child frame is
|
| // detached from the DOM.
|
| @@ -932,7 +939,9 @@ IPC_MESSAGE_ROUTED0(FrameHostMsg_DidStopLoading)
|
| IPC_MESSAGE_ROUTED1(FrameHostMsg_UpdateState, content::PageState /* state */)
|
|
|
| // Sent when the frame changes its window.name.
|
| -IPC_MESSAGE_ROUTED1(FrameHostMsg_DidChangeName, std::string /* name */)
|
| +IPC_MESSAGE_ROUTED2(FrameHostMsg_DidChangeName,
|
| + std::string /* name */,
|
| + std::string /* unique_name */)
|
|
|
| // Sent when the frame starts enforcing strict mixed content
|
| // checking. Sending this information in DidCommitProvisionalLoad isn't
|
|
|