| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 4e7c94ca61454eeef773587acafcd67daa0240ff..b1d11024be3c3da3b199d647ad1f904e331d46e9 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -41,6 +41,7 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h"
|
| @@ -74,6 +75,7 @@ class RendererAccessibility;
|
| class SkBitmap;
|
| class SpeechInputDispatcher;
|
| struct ViewMsg_Navigate_Params;
|
| +struct ViewMsg_PostMessage_Params;
|
| struct ViewMsg_StopFinding_Params;
|
| struct ViewMsg_SwapOut_Params;
|
| struct WebDropData;
|
| @@ -110,6 +112,7 @@ class ResourceFetcher;
|
| namespace WebKit {
|
| class WebApplicationCacheHost;
|
| class WebApplicationCacheHostClient;
|
| +class WebDOMMessageEvent;
|
| class WebDataSource;
|
| class WebDragData;
|
| class WebGeolocationClient;
|
| @@ -173,6 +176,7 @@ class RenderViewImpl : public RenderWidget,
|
| int32 routing_id,
|
| int64 session_storage_namespace_id,
|
| const string16& frame_name,
|
| + bool is_renderer_created,
|
| int32 next_page_id);
|
|
|
| // Returns the RenderViewImpl containing the given WebView.
|
| @@ -530,6 +534,11 @@ class RenderViewImpl : public RenderWidget,
|
| virtual void dispatchIntent(WebKit::WebFrame* frame,
|
| const WebKit::WebIntent& intent);
|
|
|
| + virtual bool willCheckAndDispatchMessageEvent(
|
| + WebKit::WebFrame* source,
|
| + WebKit::WebSecurityOrigin targetOrigin,
|
| + WebKit::WebDOMMessageEvent event) OVERRIDE;
|
| +
|
| // WebKit::WebPageSerializerClient implementation ----------------------------
|
|
|
| virtual void didSerializeDataForFrame(
|
| @@ -678,6 +687,7 @@ class RenderViewImpl : public RenderWidget,
|
| int32 routing_id,
|
| int64 session_storage_namespace_id,
|
| const string16& frame_name,
|
| + bool is_renderer_created,
|
| int32 next_page_id);
|
|
|
| // Do not delete directly. This class is reference counted.
|
| @@ -799,6 +809,7 @@ class RenderViewImpl : public RenderWidget,
|
| #if defined(OS_MACOSX)
|
| void OnPluginImeCompositionCompleted(const string16& text, int plugin_id);
|
| #endif
|
| + void OnPostMessage(int64 frame_id, const ViewMsg_PostMessage_Params& params);
|
| void OnRedo();
|
| void OnReloadFrame();
|
| void OnReplace(const string16& text);
|
| @@ -1197,6 +1208,10 @@ class RenderViewImpl : public RenderWidget,
|
| // of handling a ViewMsg_SelectRange IPC.
|
| bool handling_select_range_;
|
|
|
| + // The content frame id of the frame we're a proxy for, or -1 if none.
|
| + // This should be valid when the RV is swapped out, and -1 when swapped in.
|
| + int64 active_content_frame_id_;
|
| +
|
| // Plugins -------------------------------------------------------------------
|
|
|
| // All the currently active plugin delegates for this RenderView; kept so
|
|
|