Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

third_party/WebKit/Source/core/css/CSSStyleSheet.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 238 matching lines @@
   if (m_isInlineStylesheet)
     return true;
   KURL baseURL = m_contents->baseURL();
   if (baseURL.isEmpty())
     return true;
   Document* document = ownerDocument();
   if (!document)
     return true;
   if (document->getSecurityOrigin()->canRequestNoSuborigin(baseURL))
     return true;
-  if (m_allowRuleAccessFromOrigin &&
-      document->getSecurityOrigin()->canAccessCheckSuborigins(
-          m_allowRuleAccessFromOrigin.get()))
+  if (m_allowRuleAccessFromOrigin && document->getSecurityOrigin()->canAccess(
+                                         m_allowRuleAccessFromOrigin.get())) {
     return true;
+  }
   return false;
 }
 
 CSSRuleList* CSSStyleSheet::rules() {
   return cssRules();
 }
 
 unsigned CSSStyleSheet::insertRule(const String& ruleString,
                                    unsigned index,
                                    ExceptionState& exceptionState) {
@@ skipping 177 matching lines @@
   visitor->trace(m_deviceDependentMediaQueryResults);
   visitor->trace(m_ownerNode);
   visitor->trace(m_ownerRule);
   visitor->trace(m_mediaCSSOMWrapper);
   visitor->trace(m_childRuleCSSOMWrappers);
   visitor->trace(m_ruleListCSSOMWrapper);
   StyleSheet::trace(visitor);
 }
 
 }  // namespace blink