Revert 113579 - Content settings: allow scripts on interstitial pages even if JavaScript is blocked.

chrome/renderer/content_settings_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/content_settings_observer.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
@@ skipping 50 matching lines @@
   return CONTENT_SETTING_DEFAULT;
 }
 
 }  // namespace
 
 ContentSettingsObserver::ContentSettingsObserver(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<ContentSettingsObserver>(render_view),
       content_setting_rules_(NULL),
-      plugins_temporarily_allowed_(false),
-      is_interstitial_page_(false) {
+      plugins_temporarily_allowed_(false) {
   ClearBlockedContentSettings();
 }
 
 ContentSettingsObserver::~ContentSettingsObserver() {
 }
 
 void ContentSettingsObserver::SetContentSettingRules(
     const RendererContentSettingRules* content_setting_rules) {
   content_setting_rules_ = content_setting_rules;
 }
@@ skipping 73 matching lines @@
   bool result = false;
   Send(new ChromeViewHostMsg_AllowFileSystem(
       routing_id(), GURL(frame->document().securityOrigin().toString()),
       GURL(frame->top()->document().securityOrigin().toString()), &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowImage(WebFrame* frame,
                                          bool enabled_per_settings,
                                          const WebURL& image_url) {
-  if (is_interstitial_page_)
-    return true;
   if (IsWhitelistedForContentSettings(frame))
     return true;
 
   bool allow = enabled_per_settings;
   if (content_setting_rules_ && enabled_per_settings) {
     GURL secondary_url(image_url);
     allow = GetContentSettingFromRules(
         content_setting_rules_->image_rules,
         frame, secondary_url) != CONTENT_SETTING_BLOCK;
   }
@@ skipping 18 matching lines @@
   return result;
 }
 
 bool ContentSettingsObserver::AllowPlugins(WebFrame* frame,
                                            bool enabled_per_settings) {
   return enabled_per_settings;
 }
 
 bool ContentSettingsObserver::AllowScript(WebFrame* frame,
                                           bool enabled_per_settings) {
-  if (is_interstitial_page_)
-    return true;
   if (!enabled_per_settings)
     return false;
 
   std::map<WebFrame*, bool>::const_iterator it =
       cached_script_permissions_.find(frame);
   if (it != cached_script_permissions_.end())
     return it->second;
 
   // Evaluate the content setting rules before
   // |IsWhitelistedForContentSettings|; if there is only the default rule
   // allowing all scripts, it's quicker this way.
   bool allow = true;
   if (content_setting_rules_) {
     ContentSetting setting = GetContentSettingFromRules(
         content_setting_rules_->script_rules,
         frame,
         GURL(frame->document().securityOrigin().toString()));
     allow = setting != CONTENT_SETTING_BLOCK;
   }
   allow = allow || IsWhitelistedForContentSettings(frame);
 
   cached_script_permissions_[frame] = allow;
   return allow;
 }
 
 bool ContentSettingsObserver::AllowScriptFromSource(
     WebFrame* frame,
     bool enabled_per_settings,
     const WebKit::WebURL& script_url) {
-  if (is_interstitial_page_)
-    return true;
   if (!enabled_per_settings)
     return false;
 
   bool allow = true;
   if (content_setting_rules_) {
     ContentSetting setting = GetContentSettingFromRules(
         content_setting_rules_->script_rules,
         frame,
         GURL(script_url));
     allow = setting != CONTENT_SETTING_BLOCK;
@@ skipping 23 matching lines @@
 }
 
 void ContentSettingsObserver::DidNotAllowPlugins(WebFrame* frame) {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
 }
 
 void ContentSettingsObserver::DidNotAllowScript(WebFrame* frame) {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string());
 }
 
-void ContentSettingsObserver::SetAsInterstitial() {
-  is_interstitial_page_ = true;
-}
-
 void ContentSettingsObserver::OnLoadBlockedPlugins() {
   plugins_temporarily_allowed_ = true;
 }
 
 void ContentSettingsObserver::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
   cached_storage_permissions_.clear();
   cached_script_permissions_.clear();
 }
@@ skipping 26 matching lines @@
   const char* kDirProtocols[] = { chrome::kFtpScheme, chrome::kFileScheme };
   for (size_t i = 0; i < arraysize(kDirProtocols); ++i) {
     if (EqualsASCII(origin.protocol(), kDirProtocols[i])) {
       return document_url.SchemeIs(kDirProtocols[i]) &&
              document_url.ExtractFileName().empty();
     }
   }
 
   return false;
 }