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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
465 | 465 |
466 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type) | 466 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type) |
467 { | 467 { |
468 if (request.cachePolicy() == UseProtocolCachePolicy) | 468 if (request.cachePolicy() == UseProtocolCachePolicy) |
469 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e)); | 469 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e)); |
470 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) | 470 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
471 determineRequestContext(request, type); | 471 determineRequestContext(request, type); |
472 if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource) | 472 if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource) |
473 request.setHTTPHeaderField("Purpose", "prefetch"); | 473 request.setHTTPHeaderField("Purpose", "prefetch"); |
474 | 474 |
475 request.setURL(MemoryCache::removeFragmentIdentifierIfNeeded(request.url())) ; | |
Nate Chapin
2015/11/04 22:13:09
Instead of having Resource.cpp mess with the url,
| |
476 | |
475 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); | 477 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); |
476 } | 478 } |
477 | 479 |
478 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) | 480 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) |
479 { | 481 { |
480 ASSERT(resource); | 482 ASSERT(resource); |
481 ASSERT(memoryCache()->contains(resource)); | 483 ASSERT(memoryCache()->contains(resource)); |
482 ASSERT(resource->isLoaded()); | 484 ASSERT(resource->isLoaded()); |
483 ASSERT(resource->canUseCacheValidator()); | 485 ASSERT(resource->canUseCacheValidator()); |
484 ASSERT(!resource->isCacheValidator()); | 486 ASSERT(!resource->isCacheValidator()); |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
970 if (m_loaders && m_loaders->contains(loader)) | 972 if (m_loaders && m_loaders->contains(loader)) |
971 m_loaders->remove(loader); | 973 m_loaders->remove(loader); |
972 else if (m_nonBlockingLoaders && m_nonBlockingLoaders->contains(loader)) | 974 else if (m_nonBlockingLoaders && m_nonBlockingLoaders->contains(loader)) |
973 m_nonBlockingLoaders->remove(loader); | 975 m_nonBlockingLoaders->remove(loader); |
974 else | 976 else |
975 ASSERT_NOT_REACHED(); | 977 ASSERT_NOT_REACHED(); |
976 } | 978 } |
977 | 979 |
978 void ResourceFetcher::willStartLoadingResource(Resource* resource, ResourceReque st& request) | 980 void ResourceFetcher::willStartLoadingResource(Resource* resource, ResourceReque st& request) |
979 { | 981 { |
980 context().willStartLoadingResource(request); | 982 context().willStartLoadingResource(request, resource->type() == Resource::Ma inResource); |
981 storeResourceTimingInitiatorInformation(resource); | 983 storeResourceTimingInitiatorInformation(resource); |
982 TRACE_EVENT_ASYNC_BEGIN2("blink.net", "Resource", resource, "url", resource- >url().string().ascii(), "priority", resource->resourceRequest().priority()); | 984 TRACE_EVENT_ASYNC_BEGIN2("blink.net", "Resource", resource, "url", resource- >url().string().ascii(), "priority", resource->resourceRequest().priority()); |
983 } | 985 } |
984 | 986 |
985 void ResourceFetcher::stopFetching() | 987 void ResourceFetcher::stopFetching() |
986 { | 988 { |
987 if (m_nonBlockingLoaders) | 989 if (m_nonBlockingLoaders) |
988 m_nonBlockingLoaders->cancelAll(); | 990 m_nonBlockingLoaders->cancelAll(); |
989 if (m_loaders) | 991 if (m_loaders) |
990 m_loaders->cancelAll(); | 992 m_loaders->cancelAll(); |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1159 visitor->trace(m_archiveResourceCollection); | 1161 visitor->trace(m_archiveResourceCollection); |
1160 visitor->trace(m_loaders); | 1162 visitor->trace(m_loaders); |
1161 visitor->trace(m_nonBlockingLoaders); | 1163 visitor->trace(m_nonBlockingLoaders); |
1162 #if ENABLE(OILPAN) | 1164 #if ENABLE(OILPAN) |
1163 visitor->trace(m_preloads); | 1165 visitor->trace(m_preloads); |
1164 visitor->trace(m_resourceTimingInfoMap); | 1166 visitor->trace(m_resourceTimingInfoMap); |
1165 #endif | 1167 #endif |
1166 } | 1168 } |
1167 | 1169 |
1168 } | 1170 } |
OLD | NEW |