| Index: content/browser/renderer_host/render_view_host.h
|
| diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
|
| index 1f52eaa02350de80a59a3295094cff75a073686f..9de00eb536ea7dc6bb182d0b7e1a1b29eb8798ad 100644
|
| --- a/content/browser/renderer_host/render_view_host.h
|
| +++ b/content/browser/renderer_host/render_view_host.h
|
| @@ -44,7 +44,9 @@ struct ViewHostMsg_AccessibilityNotification_Params;
|
| struct ViewHostMsg_CreateWindow_Params;
|
| struct ViewHostMsg_ShowPopup_Params;
|
| struct ViewMsg_Navigate_Params;
|
| +struct ViewMsg_PostMessage_Params;
|
| struct ViewMsg_StopFinding_Params;
|
| +struct ViewMsg_SwapOut_Params;
|
| struct WebDropData;
|
| struct WebPreferences;
|
|
|
| @@ -155,7 +157,9 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost {
|
| // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
|
| // as the name of the new top-level frame. If |max_page_id| is larger than
|
| // -1, the RenderView is told to start issuing page IDs at |max_page_id| + 1.
|
| - virtual bool CreateRenderView(const string16& frame_name, int32 max_page_id);
|
| + virtual bool CreateRenderView(const string16& frame_name,
|
| + int opener_route_id,
|
| + int32 max_page_id);
|
|
|
| // Returns true if the RenderView is active and has not crashed. Virtual
|
| // because it is overridden by TestRenderViewHost.
|
| @@ -226,6 +230,12 @@ class CONTENT_EXPORT RenderViewHost : public RenderWidgetHost {
|
| // of the parameters.
|
| void SwapOut(int new_render_process_host_id, int new_request_id);
|
|
|
| + // Performs the actual swap out, causing the RenderView to become a proxy
|
| + // for the specified content_frame. This is called by SwapOut.
|
| + void SwapOutAndProxy(int new_render_process_host_id,
|
| + int new_request_id,
|
| + int64 content_frame);
|
| +
|
| // Called by ResourceDispatcherHost after the SwapOutACK is received.
|
| void OnSwapOutACK();
|
|
|
|
|