Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: Source/core/fetch/Resource.cpp

Issue 1300083002: Add suggestion to use "no-cors" with Fetch fails CORS check. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update case where header is present but not for the correct origin. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 } 321 }
322 322
323 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const 323 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const
324 { 324 {
325 String ignoredErrorDescription; 325 String ignoredErrorDescription;
326 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription); 326 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
327 } 327 }
328 328
329 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin, String& errorDescription) const 329 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin, String& errorDescription) const
330 { 330 {
331 return blink::passesAccessControlCheck(m_response, resourceRequest().allowSt oredCredentials() ? AllowStoredCredentials : DoNotAllowStoredCredentials, securi tyOrigin, errorDescription); 331 return blink::passesAccessControlCheck(m_response, resourceRequest().allowSt oredCredentials() ? AllowStoredCredentials : DoNotAllowStoredCredentials, securi tyOrigin, errorDescription, resourceRequest().requestContext());
332 } 332 }
333 333
334 bool Resource::isEligibleForIntegrityCheck(SecurityOrigin* securityOrigin) const 334 bool Resource::isEligibleForIntegrityCheck(SecurityOrigin* securityOrigin) const
335 { 335 {
336 String ignoredErrorDescription; 336 String ignoredErrorDescription;
337 return securityOrigin->canRequest(resourceRequest().url()) || passesAccessCo ntrolCheck(securityOrigin, ignoredErrorDescription); 337 return securityOrigin->canRequest(resourceRequest().url()) || passesAccessCo ntrolCheck(securityOrigin, ignoredErrorDescription);
338 } 338 }
339 339
340 static double currentAge(const ResourceResponse& response, double responseTimest amp) 340 static double currentAge(const ResourceResponse& response, double responseTimest amp)
341 { 341 {
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 return "ImportResource"; 1102 return "ImportResource";
1103 case Resource::Media: 1103 case Resource::Media:
1104 return "Media"; 1104 return "Media";
1105 } 1105 }
1106 ASSERT_NOT_REACHED(); 1106 ASSERT_NOT_REACHED();
1107 return "Unknown"; 1107 return "Unknown";
1108 } 1108 }
1109 #endif // !LOG_DISABLED 1109 #endif // !LOG_DISABLED
1110 1110
1111 } // namespace blink 1111 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698