Take script URLs into account when applying script content settings.

chrome/renderer/chrome_render_process_observer.h

Index: chrome/renderer/chrome_render_process_observer.h
diff --git a/chrome/renderer/chrome_render_process_observer.h b/chrome/renderer/chrome_render_process_observer.h
index 44477b8fdd12160ee639f52fe6f9758a243d4e4e..a489ac04b1383e85de0a092d255007143c62c177 100644
--- a/chrome/renderer/chrome_render_process_observer.h
+++ b/chrome/renderer/chrome_render_process_observer.h
@@ -41,9 +41,9 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver {
   // any 'clear cache' commands that were delayed until the next navigation.
   void ExecutePendingClearCache();
 
-  // Returns a pointer to the image setting rules owned by
+  // Returns a pointer to the content setting rules owned by
   // |ChromeRenderProcessObserver|.
-  const ContentSettingsForOneType* image_setting_rules() const;
+  const ContentSettingsForOneType* content_setting_rules() const;
 
  private:
   // RenderProcessObserver implementation.
@@ -54,7 +54,8 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver {
   void OnSetContentSettingsForCurrentURL(
       const GURL& url, const ContentSettings& content_settings);
   void OnSetDefaultContentSettings(const ContentSettings& content_settings);
-  void OnSetImageSettingRules(const ContentSettingsForOneType& settings);
+  void OnSetContentSettingRules(ContentSettingsType type,
+                                const ContentSettingsForOneType& settings);
   void OnSetCacheCapacities(size_t min_dead_capacity,
                             size_t max_dead_capacity,
                             size_t capacity);
@@ -75,7 +76,7 @@ class ChromeRenderProcessObserver : public content::RenderProcessObserver {
   chrome::ChromeContentRendererClient* client_;
   // If true, the web cache shall be cleared before the next navigation event.
   bool clear_cache_pending_;
-  ContentSettingsForOneType image_setting_rules_;
+  ContentSettingsForOneType content_setting_rules_[CONTENT_SETTINGS_NUM_TYPES];

[Bernhard Bauer, 2011/11/02 09:57:14]

I actually want to get rid of indexing content settings by their type, as it
creates overhead for adding more content types. We should have a struct which
contains only content settings pushed to the renderer (similar to
RendererPreferences), and maybe we could merge the content setting rules into
that struct?

[marja, 2011/11/02 14:46:35]

Done: Added struct RendererContentSettingRules.

 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderProcessObserver);
 };