diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 16:17:23 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 16:17:23 +0000 |
| commit | 9941cf535dfdf8a7a81de38e71803d7095ba703e (patch) | |
| tree | 75c152cb1ef3e2107377fa534394df281e08d38b /webkit | |
| parent | 7024d3eea1d8328883736f5cd3cbef480aa0e740 (diff) | |
| download | chromium_src-9941cf535dfdf8a7a81de38e71803d7095ba703e.zip chromium_src-9941cf535dfdf8a7a81de38e71803d7095ba703e.tar.gz chromium_src-9941cf535dfdf8a7a81de38e71803d7095ba703e.tar.bz2 | |
Add debug logging for mixed scripting.
Our mixed scripting can be very difficult to debug when the offending
request comes from nested iframes and the like because the issue won't
show up in the Javascript console for the page. This also occurs if a
redirect page loads mixed scripting.
This change cleans up a previous change (r71881) now that the WebKit
side of this has landed, and logs mixed scripting issues to the debug
log (when logging is enabled).
BUG=none
TEST=Run with --enable-logging and go to a site with mixed scripting. Confirm that a debug entry appears in the chrome_debug.log.
Review URL: http://codereview.chromium.org/6246149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 8bfcf22..df7c2e89 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -941,13 +941,6 @@ void TestWebViewDelegate::didFailResourceLoad( void TestWebViewDelegate::didDisplayInsecureContent(WebFrame* frame) { } -// 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 TestWebViewDelegate::didRunInsecureContent( - WebFrame* frame, const WebSecurityOrigin& origin) { -} - void TestWebViewDelegate::didRunInsecureContent( WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) { } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index b74cdf3..f83d282 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -224,18 +224,10 @@ class TestWebViewDelegate : public WebKit::WebViewClient, virtual void didFailResourceLoad( WebKit::WebFrame*, unsigned identifier, const WebKit::WebURLError&); virtual void didDisplayInsecureContent(WebKit::WebFrame* frame); - - // 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 the the second - // should be tagged with OVERRIDE. - virtual void didRunInsecureContent( - WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin); virtual void didRunInsecureContent( WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin, const WebKit::WebURL& target_url); - virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings); virtual void openFileSystem( WebKit::WebFrame* frame, |