| OLD | NEW |
| 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 | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 7 rights reserved. | 7 rights reserved. |
| 8 | 8 |
| 9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
| 10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 if (!errorOccurred()) | 429 if (!errorOccurred()) |
| 430 m_status = ResourceStatus::Cached; | 430 m_status = ResourceStatus::Cached; |
| 431 m_loader = nullptr; | 431 m_loader = nullptr; |
| 432 checkNotify(); | 432 checkNotify(); |
| 433 } | 433 } |
| 434 | 434 |
| 435 AtomicString Resource::httpContentType() const { | 435 AtomicString Resource::httpContentType() const { |
| 436 return response().httpContentType(); | 436 return response().httpContentType(); |
| 437 } | 437 } |
| 438 | 438 |
| 439 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const { | 439 bool Resource::passesAccessControlCheck( |
| 440 const SecurityOrigin* securityOrigin) const { |
| 440 StoredCredentials storedCredentials = | 441 StoredCredentials storedCredentials = |
| 441 lastResourceRequest().allowStoredCredentials() | 442 lastResourceRequest().allowStoredCredentials() |
| 442 ? AllowStoredCredentials | 443 ? AllowStoredCredentials |
| 443 : DoNotAllowStoredCredentials; | 444 : DoNotAllowStoredCredentials; |
| 444 CrossOriginAccessControl::AccessStatus status = | 445 CrossOriginAccessControl::AccessStatus status = |
| 445 CrossOriginAccessControl::checkAccess(response(), storedCredentials, | 446 CrossOriginAccessControl::checkAccess(response(), storedCredentials, |
| 446 securityOrigin); | 447 securityOrigin); |
| 447 | 448 |
| 448 return status == CrossOriginAccessControl::kAccessAllowed; | 449 return status == CrossOriginAccessControl::kAccessAllowed; |
| 449 } | 450 } |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1118 case Resource::Media: | 1119 case Resource::Media: |
| 1119 case Resource::Manifest: | 1120 case Resource::Manifest: |
| 1120 case Resource::Mock: | 1121 case Resource::Mock: |
| 1121 return false; | 1122 return false; |
| 1122 } | 1123 } |
| 1123 NOTREACHED(); | 1124 NOTREACHED(); |
| 1124 return false; | 1125 return false; |
| 1125 } | 1126 } |
| 1126 | 1127 |
| 1127 } // namespace blink | 1128 } // namespace blink |
| OLD | NEW |