diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:56:15 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 01:56:15 +0000 |
| commit | 5ccd4951d9e4c598395ec9135ff5569d42d5c41a (patch) | |
| tree | 2ec430c8ddea109359024f5b53f331ce7aa1cb9f /chrome/renderer/chrome_render_view_observer.h | |
| parent | 91d00b738e9e99c25e3e901426214e34a40e3007 (diff) | |
| download | chromium_src-5ccd4951d9e4c598395ec9135ff5569d42d5c41a.zip chromium_src-5ccd4951d9e4c598395ec9135ff5569d42d5c41a.tar.gz chromium_src-5ccd4951d9e4c598395ec9135ff5569d42d5c41a.tar.bz2 | |
Revert 109213 - Take script URLs into account when applying script content settings.
<cmp> We suspect this CL caused a performance regression on chromium.perf.
Reverting to see if this is the source of the regression.
Transmit script content settings to the renderer. Use the script URL as the secondary URL
for the content setting rules.
BUG=90840
TEST=ChromeRenderViewTest.ContentSettings(Allow|Block)Scripts
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109005
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109036
Review URL: http://codereview.chromium.org/8409006
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8510040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_view_observer.h')
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index c3e5fca..f0d8e82 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -90,9 +90,6 @@ class ChromeRenderViewObserver : public content::RenderViewObserver, bool enabled_per_settings) OVERRIDE; virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings) OVERRIDE; - virtual bool allowScriptFromSource(WebKit::WebFrame* frame, - bool enabled_per_settings, - const WebKit::WebURL& script_url) OVERRIDE; virtual bool allowScriptExtension(WebKit::WebFrame* frame, const WebKit::WebString& extension_name, int extension_group) OVERRIDE; |