Index: Source/WebCore/page/SecurityOrigin.cpp |
diff --git a/Source/WebCore/page/SecurityOrigin.cpp b/Source/WebCore/page/SecurityOrigin.cpp |
index 8225557cc5adc891f6fcf26049ed6e40ce187df1..09d82bc2247e3bf2b961e8facded9df4e5ce2e5a 100644 |
--- a/Source/WebCore/page/SecurityOrigin.cpp |
+++ b/Source/WebCore/page/SecurityOrigin.cpp |
@@ -117,7 +117,6 @@ SecurityOrigin::SecurityOrigin(const KURL& url) |
, m_isUnique(false) |
, m_universalAccess(false) |
, m_domainWasSetInDOM(false) |
- , m_storageBlockingPolicy(AllowAllStorage) |
, m_enforceFilePathSeparation(false) |
, m_needsDatabaseIdentifierQuirkForFiles(false) |
{ |
@@ -143,7 +142,6 @@ SecurityOrigin::SecurityOrigin() |
, m_universalAccess(false) |
, m_domainWasSetInDOM(false) |
, m_canLoadLocalResources(false) |
- , m_storageBlockingPolicy(AllowAllStorage) |
, m_enforceFilePathSeparation(false) |
, m_needsDatabaseIdentifierQuirkForFiles(false) |
{ |
@@ -160,7 +158,6 @@ SecurityOrigin::SecurityOrigin(const SecurityOrigin* other) |
, m_universalAccess(other->m_universalAccess) |
, m_domainWasSetInDOM(other->m_domainWasSetInDOM) |
, m_canLoadLocalResources(other->m_canLoadLocalResources) |
- , m_storageBlockingPolicy(other->m_storageBlockingPolicy) |
, m_enforceFilePathSeparation(other->m_enforceFilePathSeparation) |
, m_needsDatabaseIdentifierQuirkForFiles(other->m_needsDatabaseIdentifierQuirkForFiles) |
{ |
@@ -377,20 +374,7 @@ bool SecurityOrigin::canDisplay(const KURL& url) const |
bool SecurityOrigin::canAccessStorage(const SecurityOrigin* topOrigin) const |
{ |
- if (isUnique()) |
- return false; |
- |
- // FIXME: This check should be replaced with an ASSERT once we can guarantee that topOrigin is not null. |
- if (!topOrigin) |
- return true; |
- |
- if (m_storageBlockingPolicy == BlockAllStorage || topOrigin->m_storageBlockingPolicy == BlockAllStorage) |
- return false; |
- |
- if ((m_storageBlockingPolicy == BlockThirdPartyStorage || topOrigin->m_storageBlockingPolicy == BlockThirdPartyStorage) && topOrigin->isThirdParty(this)) |
- return false; |
- |
- return true; |
+ return !isUnique(); |
} |
SecurityOrigin::Policy SecurityOrigin::canShowNotifications() const |