| 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
| 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 sourceOrigin = context().getSecurityOrigin(); | 250 sourceOrigin = context().getSecurityOrigin(); |
| 251 | 251 |
| 252 if (sourceOrigin->canRequestNoSuborigin(url)) | 252 if (sourceOrigin->canRequestNoSuborigin(url)) |
| 253 return true; | 253 return true; |
| 254 | 254 |
| 255 String errorDescription; | 255 String errorDescription; |
| 256 if (!resource->passesAccessControlCheck(sourceOrigin, errorDescription)) { | 256 if (!resource->passesAccessControlCheck(sourceOrigin, errorDescription)) { |
| 257 resource->setCORSFailed(); | 257 resource->setCORSFailed(); |
| 258 if (!forPreload && (logErrorsDecision == ShouldLogAccessControlErrors))
{ | 258 if (!forPreload && (logErrorsDecision == ShouldLogAccessControlErrors))
{ |
| 259 String resourceType = Resource::resourceTypeToString(resource->getTy
pe(), resource->options().initiatorInfo); | 259 String resourceType = Resource::resourceTypeToString(resource->getTy
pe(), resource->options().initiatorInfo); |
| 260 context().addConsoleMessage(resourceType + " from origin '" + Securi
tyOrigin::create(url)->toString() + "' has been blocked from loading by Cross-Or
igin Resource Sharing policy: " + errorDescription); | 260 context().addConsoleMessage("Access to " + resourceType + " at '" +
url.getString() + "' from origin '" + SecurityOrigin::create(url)->toString() +
"' has been blocked by CORS policy: " + errorDescription); |
| 261 } | 261 } |
| 262 return false; | 262 return false; |
| 263 } | 263 } |
| 264 return true; | 264 return true; |
| 265 } | 265 } |
| 266 | 266 |
| 267 bool ResourceFetcher::isControlledByServiceWorker() const | 267 bool ResourceFetcher::isControlledByServiceWorker() const |
| 268 { | 268 { |
| 269 return context().isControlledByServiceWorker(); | 269 return context().isControlledByServiceWorker(); |
| 270 } | 270 } |
| (...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1272 visitor->trace(m_context); | 1272 visitor->trace(m_context); |
| 1273 visitor->trace(m_archive); | 1273 visitor->trace(m_archive); |
| 1274 visitor->trace(m_loaders); | 1274 visitor->trace(m_loaders); |
| 1275 visitor->trace(m_nonBlockingLoaders); | 1275 visitor->trace(m_nonBlockingLoaders); |
| 1276 visitor->trace(m_documentResources); | 1276 visitor->trace(m_documentResources); |
| 1277 visitor->trace(m_preloads); | 1277 visitor->trace(m_preloads); |
| 1278 visitor->trace(m_resourceTimingInfoMap); | 1278 visitor->trace(m_resourceTimingInfoMap); |
| 1279 } | 1279 } |
| 1280 | 1280 |
| 1281 } // namespace blink | 1281 } // namespace blink |
| OLD | NEW |