summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 00:13:02 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 00:13:02 +0000
commit9277111a69aa069feec820d7a31cc33e3e988bdb (patch)
treedc00a9439032bb76eb92ecab34f2edafa8ddfe00 /chrome/renderer/render_view.cc
parentbe1a48bcd64ea75939f38a9ab264ee99214313bb (diff)
downloadchromium_src-9277111a69aa069feec820d7a31cc33e3e988bdb.zip
chromium_src-9277111a69aa069feec820d7a31cc33e3e988bdb.tar.gz
chromium_src-9277111a69aa069feec820d7a31cc33e3e988bdb.tar.bz2
Add another didRunInsecureContent method.
In order to better log mixed-scripting issues I want to get the URL into Chrome land. This involves a WebKit change ([1]) but, by making this change first, we can decouple of the two changes. [1] https://bugs.webkit.org/show_bug.cgi?id=52384 BUG=none TEST=compile http://codereview.chromium.org/6272003/ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index fe84d68..1633aec 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3682,11 +3682,20 @@ void RenderView::didDisplayInsecureContent(WebFrame* frame) {
Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_));
}
+// We have two didRunInsecureContent's with the same name. That's because
+// we're in the process of adding an argument and one of them will be correct.
+// Once the WebKit change is in, the first should be removed.
void RenderView::didRunInsecureContent(
WebFrame* frame, const WebSecurityOrigin& origin) {
+ didRunInsecureContent(frame, origin, GURL());
+}
+
+void RenderView::didRunInsecureContent(
+ WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) {
Send(new ViewHostMsg_DidRunInsecureContent(
routing_id_,
- origin.toString().utf8()));
+ origin.toString().utf8(),
+ target));
}
bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {