Index: content/common/frame_messages.h |
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h |
index 7d03f8c508c0eb23988ba6e8c464cdca88078ed3..8f63e44de9072faa5e76dbddcbf254bf52770c10 100644 |
--- a/content/common/frame_messages.h |
+++ b/content/common/frame_messages.h |
@@ -9,6 +9,7 @@ |
#include "content/common/content_param_traits.h" |
#include "content/common/frame_message_enums.h" |
#include "content/common/frame_param.h" |
+#include "content/common/frame_replication_state.h" |
#include "content/common/navigation_gesture.h" |
#include "content/common/navigation_params.h" |
#include "content/common/resource_request_body.h" |
@@ -209,6 +210,11 @@ IPC_STRUCT_TRAITS_BEGIN(content::CommitNavigationParams) |
IPC_STRUCT_TRAITS_MEMBER(browser_navigation_start) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(content::FrameReplicationState) |
+ IPC_STRUCT_TRAITS_MEMBER(origin) |
+ IPC_STRUCT_TRAITS_MEMBER(is_unique_origin) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_BEGIN(FrameMsg_Navigate_Params) |
// TODO(clamy): investigate which parameters are also needed in PlzNavigate |
// and move them to the appropriate NavigationParams struct. |
@@ -376,10 +382,11 @@ IPC_MESSAGE_CONTROL3(FrameMsg_NewFrame, |
// |routing_id|. The new proxy should be created as a child of the object |
// identified by |parent_routing_id| or as top level if that is |
// MSG_ROUTING_NONE. |
-IPC_MESSAGE_CONTROL3(FrameMsg_NewFrameProxy, |
+IPC_MESSAGE_CONTROL4(FrameMsg_NewFrameProxy, |
int /* routing_id */, |
int /* parent_routing_id */, |
- int /* render_view_routing_id */) |
+ int /* render_view_routing_id */, |
+ content::FrameReplicationState) |
Charlie Reis
2014/11/13 18:00:57
nit: We put generally put names for the parameters
alexmos
2014/11/18 18:25:32
Fixed here and in SwapOut below.
|
// Tells the renderer to perform the specified navigation, interrupting any |
// existing navigation. |
@@ -392,8 +399,9 @@ IPC_MESSAGE_ROUTED0(FrameMsg_BeforeUnload) |
// Instructs the frame to swap out for a cross-site transition, including |
// running the unload event handler and creating a RenderFrameProxy with the |
// given |proxy_routing_id|. Expects a SwapOut_ACK message when finished. |
-IPC_MESSAGE_ROUTED1(FrameMsg_SwapOut, |
- int /* proxy_routing_id */) |
+IPC_MESSAGE_ROUTED2(FrameMsg_SwapOut, |
+ int /* proxy_routing_id */, |
+ content::FrameReplicationState) |
// Instructs the frame to stop the load in progress, if any. |
IPC_MESSAGE_ROUTED0(FrameMsg_Stop) |