Take script URLs into account when applying script content settings.

chrome/renderer/chrome_render_process_observer.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_CHROME_RENDER_PROCESS_OBSERVER_H_
 #define CHROME_RENDERER_CHROME_RENDER_PROCESS_OBSERVER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 23 matching lines @@
   explicit ChromeRenderProcessObserver(
       chrome::ChromeContentRendererClient* client);
   virtual ~ChromeRenderProcessObserver();
 
   static bool is_incognito_process() { return is_incognito_process_; }
 
   // Needs to be called by RenderViews in case of navigations to execute
   // 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.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void WebKitInitialized() OVERRIDE;
 
   void OnSetIsIncognitoProcess(bool is_incognito_process);
   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);
   // If |on_navigation| is true, the clearing is delayed until the next
   // navigation event.
   void OnClearCache(bool on_navigation);
   void OnGetCacheResourceStats();
   void OnSetFieldTrialGroup(const std::string& fiel_trial_name,
                             const std::string& group_name);
   void OnGetRendererTcmalloc();
   void OnSetTcmallocHeapProfiling(bool profiling, const std::string& prefix);
   void OnWriteTcmallocHeapProfile(const FilePath::StringType& filename);
   void OnGetV8HeapStats();
   void OnPurgeMemory();
 
   static bool is_incognito_process_;
   scoped_ptr<content::ResourceDispatcherDelegate> resource_delegate_;
   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);
 };
 
 #endif  // CHROME_RENDERER_CHROME_RENDER_PROCESS_OBSERVER_H_