summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 16:41:47 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 16:41:47 +0000
commit01c2154d3445a6824a05e4d4382b652254b28518 (patch)
treec2379440b55a43707074597977237e3ef6c4e018
parentbce9f68396175be6df5988a668fb814be762470c (diff)
downloadchromium_src-01c2154d3445a6824a05e4d4382b652254b28518.zip
chromium_src-01c2154d3445a6824a05e4d4382b652254b28518.tar.gz
chromium_src-01c2154d3445a6824a05e4d4382b652254b28518.tar.bz2
Change interface for site-isolation logging from WebKit in advance of landing WebKit side.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1516004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43088 0039d316-1c4b-4281-b951-d872f2087c98
-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);