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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
578 } | 578 } |
579 | 579 |
580 MixedContentChecker::ReportingStatus mixedContentReporting = forPreload ? | 580 MixedContentChecker::ReportingStatus mixedContentReporting = forPreload ? |
581 MixedContentChecker::SuppressReport : MixedContentChecker::SendReport; | 581 MixedContentChecker::SuppressReport : MixedContentChecker::SendReport; |
582 return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceReques
t, url, mixedContentReporting); | 582 return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceReques
t, url, mixedContentReporting); |
583 } | 583 } |
584 | 584 |
585 bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour
ceOrigin, const KURL& url) const | 585 bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour
ceOrigin, const KURL& url) const |
586 { | 586 { |
587 // Redirects can change the response URL different from one of request. | 587 // Redirects can change the response URL different from one of request. |
588 if (!canRequest(resource->type(), resource->resourceRequest(), url, resource
->options(), resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrict
ionForType)) | 588 bool forPreload = resource->isUnusedPreload(); |
| 589 if (!canRequest(resource->type(), resource->resourceRequest(), url, resource
->options(), forPreload, FetchRequest::UseDefaultOriginRestrictionForType)) |
589 return false; | 590 return false; |
590 | 591 |
591 if (!sourceOrigin && document()) | 592 if (!sourceOrigin && document()) |
592 sourceOrigin = document()->securityOrigin(); | 593 sourceOrigin = document()->securityOrigin(); |
593 | 594 |
594 if (sourceOrigin->canRequest(url)) | 595 if (sourceOrigin->canRequest(url)) |
595 return true; | 596 return true; |
596 | 597 |
597 String errorDescription; | 598 String errorDescription; |
598 if (!resource->passesAccessControlCheck(document(), sourceOrigin, errorDescr
iption)) { | 599 if (!resource->passesAccessControlCheck(document(), sourceOrigin, errorDescr
iption)) { |
599 if (resource->type() == Resource::Font) | 600 if (resource->type() == Resource::Font) |
600 toFontResource(resource)->setCORSFailed(); | 601 toFontResource(resource)->setCORSFailed(); |
601 if (frame() && frame()->document()) { | 602 if (!forPreload && frame() && frame()->document()) { |
602 String resourceType = Resource::resourceTypeToString(resource->type(
), resource->options().initiatorInfo); | 603 String resourceType = Resource::resourceTypeToString(resource->type(
), resource->options().initiatorInfo); |
603 frame()->document()->addConsoleMessage(ConsoleMessage::create(JSMess
ageSource, ErrorMessageLevel, resourceType + " from origin '" + SecurityOrigin::
create(url)->toString() + "' has been blocked from loading by Cross-Origin Resou
rce Sharing policy: " + errorDescription)); | 604 frame()->document()->addConsoleMessage(ConsoleMessage::create(JSMess
ageSource, ErrorMessageLevel, resourceType + " from origin '" + SecurityOrigin::
create(url)->toString() + "' has been blocked from loading by Cross-Origin Resou
rce Sharing policy: " + errorDescription)); |
604 } | 605 } |
605 return false; | 606 return false; |
606 } | 607 } |
607 return true; | 608 return true; |
608 } | 609 } |
609 | 610 |
610 bool ResourceFetcher::isControlledByServiceWorker() const | 611 bool ResourceFetcher::isControlledByServiceWorker() const |
611 { | 612 { |
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1638 ResourceLoaderHost::trace(visitor); | 1639 ResourceLoaderHost::trace(visitor); |
1639 } | 1640 } |
1640 | 1641 |
1641 ResourceFetcher* ResourceFetcher::toResourceFetcher(ResourceLoaderHost* host) | 1642 ResourceFetcher* ResourceFetcher::toResourceFetcher(ResourceLoaderHost* host) |
1642 { | 1643 { |
1643 ASSERT(host->objectType() == ResourceLoaderHost::ResourceFetcherType); | 1644 ASSERT(host->objectType() == ResourceLoaderHost::ResourceFetcherType); |
1644 return static_cast<ResourceFetcher*>(host); | 1645 return static_cast<ResourceFetcher*>(host); |
1645 } | 1646 } |
1646 | 1647 |
1647 } | 1648 } |
OLD | NEW |