diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:42:11 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:42:11 +0000 |
| commit | b3db76a9b3011041c2c610a8e4b02733c83d8280 (patch) | |
| tree | ce3ff1cd36abe8d4b2be183537d6fa2c0bf2fedc /chrome/common | |
| parent | 7731bf2f4de4eb5a02b5dc95ac3edcea6e5b4abf (diff) | |
| download | chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.zip chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.tar.gz chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.tar.bz2 | |
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
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/content_settings.cc | 4 | ||||
| -rw-r--r-- | chrome/common/content_settings.h | 7 | ||||
| -rw-r--r-- | chrome/common/render_messages.h | 11 |
3 files changed, 3 insertions, 19 deletions
diff --git a/chrome/common/content_settings.cc b/chrome/common/content_settings.cc index cd30d6c..ecf26f8 100644 --- a/chrome/common/content_settings.cc +++ b/chrome/common/content_settings.cc @@ -33,7 +33,3 @@ ContentSettingPatternSource::ContentSettingPatternSource( incognito(incognito) {} ContentSettingPatternSource::ContentSettingPatternSource() {} - -RendererContentSettingRules::RendererContentSettingRules() {} - -RendererContentSettingRules::~RendererContentSettingRules() {} 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<ContentSettingPatternSource> ContentSettingsForOneType; -struct RendererContentSettingRules { - RendererContentSettingRules(); - ~RendererContentSettingRules(); - ContentSettingsForOneType image_rules; - ContentSettingsForOneType script_rules; -}; - #endif // CHROME_COMMON_CONTENT_SETTINGS_H_ diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 89e395e..1d7b41d 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -148,11 +148,6 @@ IPC_STRUCT_TRAITS_BEGIN(ContentSettingPatternSource) IPC_STRUCT_TRAITS_MEMBER(incognito) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(RendererContentSettingRules) - IPC_STRUCT_TRAITS_MEMBER(image_rules) - IPC_STRUCT_TRAITS_MEMBER(script_rules) -IPC_STRUCT_TRAITS_END() - IPC_STRUCT_TRAITS_BEGIN(ThumbnailScore) IPC_STRUCT_TRAITS_MEMBER(boring_score) IPC_STRUCT_TRAITS_MEMBER(good_clipping) @@ -250,9 +245,9 @@ IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetContentSettingsForCurrentURL, IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetDefaultContentSettings, ContentSettings /* content_settings */) -// Set the content setting rules stored by the renderer. -IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetContentSettingRules, - RendererContentSettingRules /* rules */) +// Set the content settings for images. +IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetImageSettingRules, + ContentSettingsForOneType /* rules */) // Tells the render view to load all blocked plugins. IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins) |