From b3db76a9b3011041c2c610a8e4b02733c83d8280 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Tue, 8 Nov 2011 17:42:11 +0000 Subject: Revert 109036 (speculative; seems to cause increased worker test flakiness) - Take script URLs into account when applying script content settings. 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 Review URL: http://codereview.chromium.org/8409006 TBR=marja@chromium.org Review URL: http://codereview.chromium.org/8499023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109044 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/content_settings.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'chrome/common/content_settings.h') diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h index 87f5bc1..2c7e5c2 100644 --- a/chrome/common/content_settings.h +++ b/chrome/common/content_settings.h @@ -51,11 +51,4 @@ struct ContentSettingPatternSource { typedef std::vector ContentSettingsForOneType; -struct RendererContentSettingRules { - RendererContentSettingRules(); - ~RendererContentSettingRules(); - ContentSettingsForOneType image_rules; - ContentSettingsForOneType script_rules; -}; - #endif // CHROME_COMMON_CONTENT_SETTINGS_H_ -- cgit v1.1