Merge 91957

Source/WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 129 matching lines @@
     , m_isUnique(other->m_isUnique)
     , m_universalAccess(other->m_universalAccess)
     , m_domainWasSetInDOM(other->m_domainWasSetInDOM)
     , m_canLoadLocalResources(other->m_canLoadLocalResources)
     , m_enforceFilePathSeparation(other->m_enforceFilePathSeparation)
 {
 }
 
 bool SecurityOrigin::isEmpty() const
 {
+    ASSERT(!m_protocol.isEmpty() || m_isUnique);
     return m_protocol.isEmpty();
 }
 
 PassRefPtr<SecurityOrigin> SecurityOrigin::create(const KURL& url, SandboxFlags sandboxFlags)
 {
     if (!url.isValid())
         return adoptRef(new SecurityOrigin(KURL(), sandboxFlags));
     return adoptRef(new SecurityOrigin(url, sandboxFlags));
 }
 
 PassRefPtr<SecurityOrigin> SecurityOrigin::createEmpty()
 {
     return create(KURL());
 }
 
 PassRefPtr<SecurityOrigin> SecurityOrigin::threadsafeCopy()
 {
     return adoptRef(new SecurityOrigin(this));
 }
 
 void SecurityOrigin::setDomainFromDOM(const String& newDomain)
 {
     m_domainWasSetInDOM = true;
     m_domain = newDomain.lower();
 }
 
+// FIXME: This should move to SchemeRegistry!
 static HashSet<String>& schemesForbiddenFromDomainRelaxation()
 {
     DEFINE_STATIC_LOCAL(HashSet<String>, schemes, ());
     return schemes;
 }
 
 void SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const String& scheme)
 {
     if (scheme.isEmpty())
         return;
@@ skipping 180 matching lines @@
     ASSERT(isLocal());
     m_enforceFilePathSeparation = true;
 }
 
 bool SecurityOrigin::isLocal() const
 {
     return SchemeRegistry::shouldTreatURLSchemeAsLocal(m_protocol);
 }
 
 bool SecurityOrigin::isSecureTransitionTo(const KURL& url) const
-{ 
-    // New window created by the application
+{
+    // This origin represents a new window created by the application.
     if (isEmpty())
         return true;
 
     RefPtr<SecurityOrigin> other = SecurityOrigin::create(url);
     return canAccess(other.get());
 }
 
 String SecurityOrigin::toString() const
 {
-    if (isEmpty())
-        return "null";
-
     if (isUnique())
         return "null";
 
     if (m_protocol == "file") {
         if (m_enforceFilePathSeparation)
             return "null";
         return "file://";
     }
 
     Vector<UChar> result;
@@ skipping 180 matching lines @@
 
 void SecurityOrigin::resetOriginAccessWhitelists()
 {
     ASSERT(isMainThread());
     OriginAccessMap& map = originAccessMap();
     deleteAllValues(map);
     map.clear();
 }
 
 } // namespace WebCore