CrossOriginAccessControl: separate access checks and error message generation

third_party/WebKit/Source/core/fetch/Resource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
@@ skipping 426 matching lines @@
   m_loader = nullptr;
   checkNotify();
 }
 
 AtomicString Resource::httpContentType() const {
   return extractMIMETypeFromMediaType(
       m_response.httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const {
-  String ignoredErrorDescription;
-  return passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
-}
+  StoredCredentials storedCredentials =
+      lastResourceRequest().allowStoredCredentials()
+          ? AllowStoredCredentials
+          : DoNotAllowStoredCredentials;
+  CrossOriginAccessControl::AccessStatus status =
+      CrossOriginAccessControl::checkAccess(m_response, storedCredentials,
+                                            securityOrigin);
 
-bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin,
-                                        String& errorDescription) const {
-  return blink::passesAccessControlCheck(
-      m_response, lastResourceRequest().allowStoredCredentials()
-                      ? AllowStoredCredentials
-                      : DoNotAllowStoredCredentials,
-      securityOrigin, errorDescription, lastResourceRequest().requestContext());
+  return status == CrossOriginAccessControl::kAccessAllowed;
 }
 
 bool Resource::isEligibleForIntegrityCheck(
     SecurityOrigin* securityOrigin) const {
-  String ignoredErrorDescription;
   return securityOrigin->canRequest(resourceRequest().url()) ||
-         passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
+         passesAccessControlCheck(securityOrigin);
 }
 
 void Resource::setIntegrityDisposition(
     ResourceIntegrityDisposition disposition) {
   DCHECK_NE(disposition, ResourceIntegrityDisposition::NotChecked);
   DCHECK(m_type == Resource::Script || m_type == Resource::CSSStyleSheet);
   m_integrityDisposition = disposition;
 }
 
 bool Resource::mustRefetchDueToIntegrityMetadata(
@@ skipping 643 matching lines @@
     case Resource::Media:
     case Resource::Manifest:
     case Resource::Mock:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace blink