Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index b4554cb458117816ef77ffa3d7e94b1bfd6af251..2f7bb397f53c1c608550c31244bb31fadb96dbae 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,8 @@ class RendererAccessibility; |
class SkBitmap; |
class SpeechInputDispatcher; |
struct ViewMsg_Navigate_Params; |
+struct ViewMsg_PostMessage_Params; |
+struct ViewMsg_SetOpenerProxy_Params; |
struct ViewMsg_StopFinding_Params; |
struct ViewMsg_SwapOut_Params; |
struct WebDropData; |
@@ -110,6 +113,7 @@ class ResourceFetcher; |
namespace WebKit { |
class WebApplicationCacheHost; |
class WebApplicationCacheHostClient; |
+class WebDOMMessageEvent; |
class WebDataSource; |
class WebDragData; |
class WebGeolocationClient; |
@@ -538,6 +542,10 @@ class RenderViewImpl : public RenderWidget, |
virtual void dispatchIntent(WebKit::WebFrame* frame, |
const WebKit::WebIntent& intent); |
+ virtual bool interceptPostMessage(int64 source_frame_id, |
+ WebKit::WebSecurityOrigin targetOrigin, |
+ WebKit::WebDOMMessageEvent event); |
+ |
// WebKit::WebPageSerializerClient implementation ---------------------------- |
virtual void didSerializeDataForFrame( |
@@ -806,6 +814,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); |
@@ -829,6 +838,7 @@ class RenderViewImpl : public RenderWidget, |
void OnSetInLiveResize(bool in_live_resize); |
#endif |
void OnScrollFocusedEditableNodeIntoRect(const gfx::Rect& rect); |
+ void OnSetOpenerProxy(const ViewMsg_SetOpenerProxy_Params& params); |
void OnSetPageEncoding(const std::string& encoding_name); |
void OnSetRendererPrefs(const content::RendererPreferences& renderer_prefs); |
#if defined(OS_MACOSX) |
@@ -911,6 +921,9 @@ class RenderViewImpl : public RenderWidget, |
WebKit::WebFrame* frame, |
WebKit::WebNavigationType type); |
+ void InstallDOMProxy(WebKit::WebFrame *frame, |
+ int64 browsing_instance_frame_id); |
+ |
bool MaybeLoadAlternateErrorPage(WebKit::WebFrame* frame, |
const WebKit::WebURLError& error, |
bool replace); |
@@ -1205,6 +1218,10 @@ class RenderViewImpl : public RenderWidget, |
// of handling a ViewMsg_SelectRange IPC. |
bool handling_select_range_; |
+ // The browsing instance frame id of the frame we're a proxy for, or |
+ // -1 if none. |
+ int64 proxy_of_browsing_instance_frame_id_; |
Charlie Reis
2011/12/12 22:20:36
This seems a bit confusing to me, partly because o
supersat
2011/12/15 19:30:49
Done. Yes.
|
+ |
// Plugins ------------------------------------------------------------------- |
// All the currently active plugin delegates for this RenderView; kept so |