Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3589)

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 8604008: Update callers of WebSecurityOrigin::isEmpty to call WebSecurityOrigin::isUnique (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer.cc
===================================================================
--- chrome/renderer/content_settings_observer.cc (revision 110783)
+++ chrome/renderer/content_settings_observer.cc (working copy)
@@ -32,7 +32,7 @@
// True if |frame| contains content that is white-listed for content settings.
static bool IsWhitelistedForContentSettings(WebFrame* frame) {
WebSecurityOrigin origin = frame->document().securityOrigin();
- if (origin.isEmpty())
+ if (origin.isUnique())
return false; // Uninitialized document?
if (EqualsASCII(origin.protocol(), chrome::kChromeUIScheme))
@@ -161,9 +161,9 @@
const WebString& name,
const WebString& display_name,
unsigned long estimated_size) {
- if (frame->document().securityOrigin().isEmpty() ||
- frame->top()->document().securityOrigin().isEmpty())
- return false; // Uninitialized document.
+ if (frame->document().securityOrigin().isUnique() ||
+ frame->top()->document().securityOrigin().isUnique())
+ return false;
bool result = false;
Send(new ChromeViewHostMsg_AllowDatabase(
@@ -174,9 +174,9 @@
}
bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) {
- if (frame->document().securityOrigin().isEmpty() ||
- frame->top()->document().securityOrigin().isEmpty())
- return false; // Uninitialized document.
+ if (frame->document().securityOrigin().isUnique() ||
+ frame->top()->document().securityOrigin().isUnique())
+ return false;
bool result = false;
Send(new ChromeViewHostMsg_AllowFileSystem(
@@ -207,9 +207,9 @@
bool ContentSettingsObserver::AllowIndexedDB(WebFrame* frame,
const WebString& name,
const WebSecurityOrigin& origin) {
- if (frame->document().securityOrigin().isEmpty() ||
- frame->top()->document().securityOrigin().isEmpty())
- return false; // Uninitialized document.
+ if (frame->document().securityOrigin().isUnique() ||
+ frame->top()->document().securityOrigin().isUnique())
+ return false;
bool result = false;
Send(new ChromeViewHostMsg_AllowIndexedDB(
@@ -270,9 +270,9 @@
}
bool ContentSettingsObserver::AllowStorage(WebFrame* frame, bool local) {
- if (frame->document().securityOrigin().isEmpty() ||
- frame->top()->document().securityOrigin().isEmpty())
- return false; // Uninitialized document.
+ if (frame->document().securityOrigin().isUnique() ||
+ frame->top()->document().securityOrigin().isUnique())
+ return false;
bool result = false;
StoragePermissionsKey key(
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698