Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

third_party/WebKit/Source/core/frame/DOMWindow.cpp

 // Copyright 2014 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 "core/frame/DOMWindow.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/SecurityContext.h"
@@ skipping 119 matching lines @@
   // way we should allow the access.
   if (isCurrentlyDisplayedInFrame()) {
     // FIXME: Is there some way to eliminate the need for a separate
     // "callingWindow == this" check?
     if (&callingWindow == this)
       return false;
 
     // FIXME: The name canAccess seems to be a roundabout way to ask "can
     // execute script".  Can we name the SecurityOrigin function better to make
     // this more clear?
-    if (callingWindow.document()->getSecurityOrigin()->canAccessCheckSuborigins(
-            frame()->securityContext()->getSecurityOrigin()))
+    if (callingWindow.document()->getSecurityOrigin()->canAccess(
+            frame()->securityContext()->getSecurityOrigin())) {
       return false;
+    }
   }
 
   callingWindow.printErrorMessage(
       crossDomainAccessErrorMessage(&callingWindow));
   return true;
 }
 
 void DOMWindow::postMessage(PassRefPtr<SerializedScriptValue> message,
                             const MessagePortArray& ports,
                             const String& targetOrigin,
@@ skipping 110 matching lines @@
 
   // FIXME: This message, and other console messages, have extra newlines.
   // Should remove them.
   const SecurityOrigin* activeOrigin =
       callingWindow->document()->getSecurityOrigin();
   const SecurityOrigin* targetOrigin =
       frame()->securityContext()->getSecurityOrigin();
   // It's possible for a remote frame to be same origin with respect to a
   // local frame, but it must still be treated as a disallowed cross-domain
   // access. See https://crbug.com/601629.
-  ASSERT(frame()->isRemoteFrame() ||
-         !activeOrigin->canAccessCheckSuborigins(targetOrigin));
+  DCHECK(frame()->isRemoteFrame() || !activeOrigin->canAccess(targetOrigin));
 
   String message = "Blocked a frame with origin \"" + activeOrigin->toString() +
                    "\" from accessing a frame with origin \"" +
                    targetOrigin->toString() + "\". ";
 
   // Sandbox errors: Use the origin of the frames' location, rather than their
   // actual origin (since we know that at least one will be "null").
   KURL activeURL = callingWindow->document()->url();
   // TODO(alexmos): RemoteFrames do not have a document, and their URLs
   // aren't replicated.  For now, construct the URL using the replicated
@@ skipping 137 matching lines @@
 }
 
 DEFINE_TRACE(DOMWindow) {
   visitor->trace(m_frame);
   visitor->trace(m_inputCapabilities);
   visitor->trace(m_location);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink