Take script URLs into account when applying script content settings.

chrome/renderer/chrome_render_view_observer.cc

 // 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.
 
 #include "chrome/renderer/chrome_render_view_observer.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 398 matching lines @@
 bool ChromeRenderViewObserver::allowPlugins(WebFrame* frame,
                                            bool enabled_per_settings) {
   return content_settings_->AllowPlugins(frame, enabled_per_settings);
 }
 
 bool ChromeRenderViewObserver::allowScript(WebFrame* frame,
                                           bool enabled_per_settings) {
   return content_settings_->AllowScript(frame, enabled_per_settings);
 }
 
+bool ChromeRenderViewObserver::allowScriptFromSource(
+    WebFrame* frame, bool enabled_per_settings,

[jochen (gone - plz use gerrit), 2011/11/02 09:25:05]

nit. each parameter on its own line

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

Done.

+    const WebURL& script_url) {
+  return content_settings_->AllowScriptFromSource(frame, enabled_per_settings,
+                                                  script_url);
+}
+
 bool ChromeRenderViewObserver::allowScriptExtension(
     WebFrame* frame, const WebString& extension_name, int extension_group) {
   return extension_dispatcher_->AllowScriptExtension(
       frame, extension_name.utf8(), extension_group);
 }
 
 bool ChromeRenderViewObserver::allowStorage(WebFrame* frame, bool local) {
   return content_settings_->AllowStorage(frame, local);
 }
 
@@ skipping 589 matching lines @@
     // Decode the favicon using WebKit's image decoder.
     webkit_glue::ImageDecoder decoder(
         gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize));
     const unsigned char* src_data =
         reinterpret_cast<const unsigned char*>(&data[0]);
 
     return decoder.Decode(src_data, data.size());
   }
   return SkBitmap();
 }