summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_view.cc3
-rw-r--r--chrome/renderer/render_view.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 61a3da5..c51dd20 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2873,8 +2873,9 @@ void RenderView::didCreateIsolatedScriptContext(WebFrame* frame) {
}
void RenderView::didMakeCrossFrameAccess(WebFrame* frame,
+ WebFrame* target,
bool cross_origin,
- const WebString& property,
+ const WebString& property_name,
unsigned long long event_id) {
// TODO(johnnyg): track the individual properties and repeat event_ids.
if (cross_origin)
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index e368bdc..5ef764c 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -381,8 +381,8 @@ class RenderView : public RenderWidget,
virtual void didDestroyScriptContext(WebKit::WebFrame* frame);
virtual void didCreateIsolatedScriptContext(WebKit::WebFrame* frame);
virtual void didMakeCrossFrameAccess(
- WebKit::WebFrame* frame, bool crossOrigin, const WebKit::WebString& name,
- unsigned long long event_id);
+ WebKit::WebFrame* frame, WebKit::WebFrame* target, bool cross_origin,
+ const WebKit::WebString& property_name, unsigned long long event_id);
virtual void didChangeContentsSize(
WebKit::WebFrame* frame, const WebKit::WebSize& size);
virtual void didChangeScrollOffset(WebKit::WebFrame* frame);