| 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 | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 6 rights reserved. | 6 rights reserved. |
| 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 | 421 |
| 422 void ResourceFetcher::makePreloadedResourceBlockOnloadIfNeeded( | 422 void ResourceFetcher::makePreloadedResourceBlockOnloadIfNeeded( |
| 423 Resource* resource, | 423 Resource* resource, |
| 424 const FetchRequest& request) { | 424 const FetchRequest& request) { |
| 425 // TODO(yoav): Test that non-blocking resources (video/audio/track) continue | 425 // TODO(yoav): Test that non-blocking resources (video/audio/track) continue |
| 426 // to not-block even after being preloaded and discovered. | 426 // to not-block even after being preloaded and discovered. |
| 427 if (resource && resource->loader() && | 427 if (resource && resource->loader() && |
| 428 resource->isLoadEventBlockingResourceType() && | 428 resource->isLoadEventBlockingResourceType() && |
| 429 resource->isLinkPreload() && !request.isLinkPreload() && | 429 resource->isLinkPreload() && !request.isLinkPreload() && |
| 430 m_nonBlockingLoaders.contains(resource->loader())) { | 430 m_nonBlockingLoaders.contains(resource->loader())) { |
| 431 m_nonBlockingLoaders.remove(resource->loader()); | 431 m_nonBlockingLoaders.erase(resource->loader()); |
| 432 m_loaders.insert(resource->loader()); | 432 m_loaders.insert(resource->loader()); |
| 433 } | 433 } |
| 434 } | 434 } |
| 435 | 435 |
| 436 void ResourceFetcher::updateMemoryCacheStats(Resource* resource, | 436 void ResourceFetcher::updateMemoryCacheStats(Resource* resource, |
| 437 RevalidationPolicy policy, | 437 RevalidationPolicy policy, |
| 438 const FetchRequest& request, | 438 const FetchRequest& request, |
| 439 const ResourceFactory& factory, | 439 const ResourceFactory& factory, |
| 440 bool isStaticData) const { | 440 bool isStaticData) const { |
| 441 if (isStaticData) | 441 if (isStaticData) |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1215 resource->error(error); | 1215 resource->error(error); |
| 1216 | 1216 |
| 1217 handleLoadCompletion(resource); | 1217 handleLoadCompletion(resource); |
| 1218 } | 1218 } |
| 1219 | 1219 |
| 1220 void ResourceFetcher::moveResourceLoaderToNonBlocking(ResourceLoader* loader) { | 1220 void ResourceFetcher::moveResourceLoaderToNonBlocking(ResourceLoader* loader) { |
| 1221 DCHECK(loader); | 1221 DCHECK(loader); |
| 1222 // TODO(yoav): Convert CHECK to DCHECK if no crash reports come in. | 1222 // TODO(yoav): Convert CHECK to DCHECK if no crash reports come in. |
| 1223 CHECK(m_loaders.contains(loader)); | 1223 CHECK(m_loaders.contains(loader)); |
| 1224 m_nonBlockingLoaders.insert(loader); | 1224 m_nonBlockingLoaders.insert(loader); |
| 1225 m_loaders.remove(loader); | 1225 m_loaders.erase(loader); |
| 1226 } | 1226 } |
| 1227 | 1227 |
| 1228 bool ResourceFetcher::startLoad(Resource* resource) { | 1228 bool ResourceFetcher::startLoad(Resource* resource) { |
| 1229 DCHECK(resource); | 1229 DCHECK(resource); |
| 1230 DCHECK(resource->stillNeedsLoad()); | 1230 DCHECK(resource->stillNeedsLoad()); |
| 1231 if (!context().shouldLoadNewResource(resource->getType())) { | 1231 if (!context().shouldLoadNewResource(resource->getType())) { |
| 1232 memoryCache()->remove(resource); | 1232 memoryCache()->remove(resource); |
| 1233 return false; | 1233 return false; |
| 1234 } | 1234 } |
| 1235 | 1235 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 1261 resource->setFetcherSecurityOrigin(sourceOrigin); | 1261 resource->setFetcherSecurityOrigin(sourceOrigin); |
| 1262 | 1262 |
| 1263 loader->activateCacheAwareLoadingIfNeeded(request); | 1263 loader->activateCacheAwareLoadingIfNeeded(request); |
| 1264 loader->start(request); | 1264 loader->start(request); |
| 1265 return true; | 1265 return true; |
| 1266 } | 1266 } |
| 1267 | 1267 |
| 1268 void ResourceFetcher::removeResourceLoader(ResourceLoader* loader) { | 1268 void ResourceFetcher::removeResourceLoader(ResourceLoader* loader) { |
| 1269 DCHECK(loader); | 1269 DCHECK(loader); |
| 1270 if (m_loaders.contains(loader)) | 1270 if (m_loaders.contains(loader)) |
| 1271 m_loaders.remove(loader); | 1271 m_loaders.erase(loader); |
| 1272 else if (m_nonBlockingLoaders.contains(loader)) | 1272 else if (m_nonBlockingLoaders.contains(loader)) |
| 1273 m_nonBlockingLoaders.remove(loader); | 1273 m_nonBlockingLoaders.erase(loader); |
| 1274 else | 1274 else |
| 1275 NOTREACHED(); | 1275 NOTREACHED(); |
| 1276 } | 1276 } |
| 1277 | 1277 |
| 1278 void ResourceFetcher::stopFetching() { | 1278 void ResourceFetcher::stopFetching() { |
| 1279 HeapVector<Member<ResourceLoader>> loadersToCancel; | 1279 HeapVector<Member<ResourceLoader>> loadersToCancel; |
| 1280 for (const auto& loader : m_nonBlockingLoaders) | 1280 for (const auto& loader : m_nonBlockingLoaders) |
| 1281 loadersToCancel.push_back(loader); | 1281 loadersToCancel.push_back(loader); |
| 1282 for (const auto& loader : m_loaders) | 1282 for (const auto& loader : m_loaders) |
| 1283 loadersToCancel.push_back(loader); | 1283 loadersToCancel.push_back(loader); |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1540 visitor->trace(m_context); | 1540 visitor->trace(m_context); |
| 1541 visitor->trace(m_archive); | 1541 visitor->trace(m_archive); |
| 1542 visitor->trace(m_loaders); | 1542 visitor->trace(m_loaders); |
| 1543 visitor->trace(m_nonBlockingLoaders); | 1543 visitor->trace(m_nonBlockingLoaders); |
| 1544 visitor->trace(m_documentResources); | 1544 visitor->trace(m_documentResources); |
| 1545 visitor->trace(m_preloads); | 1545 visitor->trace(m_preloads); |
| 1546 visitor->trace(m_resourceTimingInfoMap); | 1546 visitor->trace(m_resourceTimingInfoMap); |
| 1547 } | 1547 } |
| 1548 | 1548 |
| 1549 } // namespace blink | 1549 } // namespace blink |
| OLD | NEW |