Pass frame and toplevel frame security origin for all site data related content settings IPCs

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/common/database_messages.h"
 #include "content/common/view_messages.h"
@@ skipping 126 matching lines @@
       ContentSettingsObserver* observer = ContentSettingsObserver::Get(opener);
       SetContentSettings(observer->current_content_settings_);
     }
   }
 }
 
 bool ContentSettingsObserver::AllowDatabase(WebFrame* frame,
                                             const WebString& name,
                                             const WebString& display_name,
                                             unsigned long estimated_size) {
-  WebSecurityOrigin origin = frame->securityOrigin();
-  if (origin.isEmpty())
-    return false;  // Uninitialized document?
+  if (frame->securityOrigin().isEmpty() ||
+      frame->top()->securityOrigin().isEmpty())
+    return false; // Uninitialized document.
 
   bool result = false;
   Send(new ViewHostMsg_AllowDatabase(
-      routing_id(), GURL(origin.toString()), name, display_name, &result));
+      routing_id(), GURL(frame->securityOrigin().toString()),
+      GURL(frame->top()->securityOrigin().toString()),
+      name, display_name, &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) {
-  WebSecurityOrigin origin = frame->securityOrigin();
-  if (origin.isEmpty())
-    return false;  // Uninitialized document?
+  if (frame->securityOrigin().isEmpty() ||
+      frame->top()->securityOrigin().isEmpty())
+    return false; // Uninitialized document.
 
   bool result = false;
   Send(new ViewHostMsg_AllowFileSystem(
-      routing_id(), GURL(origin.toString()), &result));
+      routing_id(), GURL(frame->securityOrigin().toString()),
+      GURL(frame->top()->securityOrigin().toString()), &result));
   return result;
 }
 
 bool ContentSettingsObserver::AllowImages(WebFrame* frame,
                                           bool enabled_per_settings) {
   if (enabled_per_settings &&
       AllowContentType(CONTENT_SETTINGS_TYPE_IMAGES)) {
     return true;
   }
 
   if (IsWhitelistedForContentSettings(frame))
     return true;
 
   DidBlockContentType(CONTENT_SETTINGS_TYPE_IMAGES, std::string());
   return false;  // Other protocols fall through here.
 }
 
 bool ContentSettingsObserver::AllowIndexedDB(WebFrame* frame,
                                              const WebString& name,
                                              const WebSecurityOrigin& origin) {
+  if (frame->securityOrigin().isEmpty() ||
+      frame->top()->securityOrigin().isEmpty())
+    return false; // Uninitialized document.
+
   bool result = false;
   Send(new ViewHostMsg_AllowIndexedDB(
-      routing_id(), origin.databaseIdentifier(), name, &result));
+      routing_id(), GURL(frame->securityOrigin().toString()),
+      GURL(frame->top()->securityOrigin().toString()),
+      name, &result));
   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 (enabled_per_settings &&
       AllowContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT)) {
     return true;
   }
 
   if (IsWhitelistedForContentSettings(frame))
     return true;
 
   return false;  // Other protocols fall through here.
 }
 
 bool ContentSettingsObserver::AllowStorage(WebFrame* frame, bool local) {
+  if (frame->securityOrigin().isEmpty() ||
+      frame->top()->securityOrigin().isEmpty())
+    return false; // Uninitialized document.
   bool result = false;
+
   Send(new ViewHostMsg_AllowDOMStorage(
-      routing_id(), frame->url(),
+      routing_id(), GURL(frame->securityOrigin().toString()),
+      GURL(frame->top()->securityOrigin().toString()),
       local ? DOM_STORAGE_LOCAL : DOM_STORAGE_SESSION,
       &result));
   return result;
 }
 
 void ContentSettingsObserver::DidNotAllowPlugins(WebFrame* frame) {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
 }
 
 void ContentSettingsObserver::DidNotAllowScript(WebFrame* frame) {
@@ skipping 14 matching lines @@
     ContentSettingsType settings_type) {
   // CONTENT_SETTING_ASK is only valid for cookies.
   return current_content_settings_.settings[settings_type] !=
       CONTENT_SETTING_BLOCK;
 }
 
 void ContentSettingsObserver::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
 }