Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

third_party/WebKit/Source/bindings/core/v8/BindingSecurity.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
 
   // It's important to check that targetWindow is a LocalDOMWindow: it's
   // possible for a remote frame and local frame to have the same security
   // origin, depending on the model being used to allocate Frames between
   // processes. See https://crbug.com/601629.
   if (!(accessingWindow && targetWindow && targetWindow->isLocalDOMWindow()))
     return false;
 
   const SecurityOrigin* accessingOrigin =
       accessingWindow->document()->getSecurityOrigin();
-  if (!accessingOrigin->canAccessCheckSuborigins(targetFrameOrigin))
+  if (!accessingOrigin->canAccess(targetFrameOrigin))
     return false;
 
   // Notify the loader's client if the initial document has been accessed.
   LocalFrame* targetFrame = toLocalDOMWindow(targetWindow)->frame();
   if (targetFrame &&
       targetFrame->loader().stateMachine()->isDisplayingInitialEmptyDocument())
     targetFrame->loader().didAccessInitialDocument();
 
   return true;
 }
@@ skipping 160 matching lines @@
       accessingFrame->securityContext()->getSecurityOrigin();
 
   const Frame* targetFrame = targetWindow->frame();
   DCHECK(targetFrame);
   DCHECK(targetFrame->securityContext());
   const SecurityOrigin* targetOrigin =
       targetFrame->securityContext()->getSecurityOrigin();
   SECURITY_CHECK(!(targetWindow && targetWindow->frame()) ||
                  targetWindow == targetWindow->frame()->domWindow());
 
-  if (!accessingOrigin->canAccessCheckSuborigins(targetOrigin))
+  if (!accessingOrigin->canAccess(targetOrigin))
     return false;
 
   // Note that there is no need to call back
   // FrameLoader::didAccessInitialDocument() because |targetWindow| must be
   // a child window inside iframe or frame and it doesn't have a URL bar,
   // so there is no need to worry about URL spoofing.
 
   return true;
 }
 
@@ skipping 10 matching lines @@
   // arguments, so the generated exception can be more descriptive.
   ExceptionState exceptionState(isolate, ExceptionState::UnknownContext,
                                 nullptr, nullptr);
   exceptionState.throwSecurityError(
       targetWindow->sanitizedCrossDomainAccessErrorMessage(
           currentDOMWindow(isolate)),
       targetWindow->crossDomainAccessErrorMessage(currentDOMWindow(isolate)));
 }
 
 }  // namespace blink