Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

third_party/WebKit/Source/platform/weborigin/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 213 matching lines @@
 bool SecurityOrigin::canAccess(const SecurityOrigin* other) const {
   if (m_universalAccess)
     return true;
 
   if (this == other)
     return true;
 
   if (isUnique() || other->isUnique())
     return false;
 
+  if (hasSuborigin() != other->hasSuborigin())
+    return false;
+
+  if (hasSuborigin() && suborigin()->name() != other->suborigin()->name())
+    return false;
+
   // document.domain handling, as per
   // https://html.spec.whatwg.org/multipage/browsers.html#dom-document-domain:
   //
   // 1) Neither document has set document.domain. In this case, we insist
   //    that the scheme, host, and port of the URLs match.
   //
   // 2) Both documents have set document.domain. In this case, we insist
   //    that the documents have set document.domain to the same value and
   //    that the scheme of the URLs match. Ports do not need to match.
   bool canAccess = false;
   if (m_protocol == other->m_protocol) {
     if (!m_domainWasSetInDOM && !other->m_domainWasSetInDOM) {
       if (m_host == other->m_host && m_port == other->m_port)
         canAccess = true;
     } else if (m_domainWasSetInDOM && other->m_domainWasSetInDOM) {
       if (m_domain == other->m_domain)
         canAccess = true;
     }
   }
 
   if (canAccess && isLocal())
     canAccess = passesFileCheck(other);
 
   return canAccess;
 }
 
-bool SecurityOrigin::canAccessCheckSuborigins(
-    const SecurityOrigin* other) const {
-  if (hasSuborigin() != other->hasSuborigin())
-    return false;
-
-  if (hasSuborigin() && suborigin()->name() != other->suborigin()->name())
-    return false;
-
-  return canAccess(other);
-}
-
 bool SecurityOrigin::passesFileCheck(const SecurityOrigin* other) const {
   ASSERT(isLocal() && other->isLocal());
 
   return !m_blockLocalAccessFromLocalOrigin &&
          !other->m_blockLocalAccessFromLocalOrigin;
 }
 
 bool SecurityOrigin::canRequest(const KURL& url) const {
   if (m_universalAccess)
     return true;
@@ skipping 337 matching lines @@
         utf8.data(), url::Component(0, utf8.length()), &canonOutput, &outHost);
   } else {
     *success = url::CanonicalizeHost(host.characters16(),
                                      url::Component(0, host.length()),
                                      &canonOutput, &outHost);
   }
   return String::fromUTF8(canonOutput.data(), canonOutput.length());
 }
 
 }  // namespace blink