Index: content/renderer/render_frame_impl.h |
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
index 77d4941458969da14df8f10cb08ec9743ff6bc57..e1198ed060b9f4b764245e3edcc3b831457edd51 100644 |
--- a/content/renderer/render_frame_impl.h |
+++ b/content/renderer/render_frame_impl.h |
@@ -28,6 +28,7 @@ |
#include "third_party/WebKit/public/web/WebDataSource.h" |
#include "third_party/WebKit/public/web/WebFrameClient.h" |
#include "third_party/WebKit/public/web/WebHistoryCommitType.h" |
+#include "third_party/WebKit/public/web/WebRemoteFrame.h" |
#include "ui/gfx/range/range.h" |
#if defined(OS_ANDROID) |
@@ -88,6 +89,7 @@ class UserMediaClientImpl; |
struct CommitNavigationParams; |
struct CommonNavigationParams; |
struct CustomContextMenuContext; |
+struct FrameReplicationState; |
struct RequestNavigationParams; |
struct ResourceResponseHead; |
@@ -128,6 +130,10 @@ class CONTENT_EXPORT RenderFrameImpl |
static void InstallCreateHook( |
RenderFrameImpl* (*create_render_frame_impl)(RenderViewImpl*, int32)); |
+ // Pass replicated information, such as security origin, to a WebRemoteFrame. |
+ static void SetReplicatedState(blink::WebRemoteFrame* frame, |
+ const FrameReplicationState& state); |
+ |
virtual ~RenderFrameImpl(); |
bool is_swapped_out() const { |
@@ -513,6 +519,7 @@ class CONTENT_EXPORT RenderFrameImpl |
OnExtendSelectionAndDelete); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ReloadWhileSwappedOut); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SendSwapOutACK); |
+ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OriginReplicationForSwapOut); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
SetEditableSelectionAndComposition); |
FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
@@ -536,7 +543,8 @@ class CONTENT_EXPORT RenderFrameImpl |
// The documentation for these functions should be in |
// content/common/*_messages.h for the message that the function is handling. |
void OnBeforeUnload(); |
- void OnSwapOut(int proxy_routing_id); |
+ void OnSwapOut(int proxy_routing_id, |
+ const FrameReplicationState& remote_frame_state); |
void OnStop(); |
void OnShowContextMenu(const gfx::Point& location); |
void OnContextMenuClosed(const CustomContextMenuContext& custom_context); |