Chromium Code Reviews| 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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 440 if (!resource) | 440 if (!resource) |
| 441 resource = memoryCache()->resourceForURL(url, getCacheIdentifier()); | 441 resource = memoryCache()->resourceForURL(url, getCacheIdentifier()); |
| 442 | 442 |
| 443 // See if we can use an existing resource from the cache. If so, we need to move it to be load blocking. | 443 // See if we can use an existing resource from the cache. If so, we need to move it to be load blocking. |
| 444 moveCachedNonBlockingResourceToBlocking(resource.get(), request); | 444 moveCachedNonBlockingResourceToBlocking(resource.get(), request); |
| 445 | 445 |
| 446 const RevalidationPolicy policy = determineRevalidationPolicy(factory.type() , request, resource.get(), isStaticData); | 446 const RevalidationPolicy policy = determineRevalidationPolicy(factory.type() , request, resource.get(), isStaticData); |
| 447 | 447 |
| 448 updateMemoryCacheStats(resource.get(), policy, request, factory, isStaticDat a); | 448 updateMemoryCacheStats(resource.get(), policy, request, factory, isStaticDat a); |
| 449 | 449 |
| 450 initializeResourceRequest(request.mutableResourceRequest(), factory.type()); | 450 initializeResourceRequest(request.mutableResourceRequest(), factory.type(), request.defer()); |
| 451 switch (policy) { | 451 switch (policy) { |
| 452 case Reload: | 452 case Reload: |
| 453 memoryCache()->remove(resource.get()); | 453 memoryCache()->remove(resource.get()); |
| 454 // Fall through | 454 // Fall through |
| 455 case Load: | 455 case Load: |
| 456 resource = createResourceForLoading(request, request.charset(), factory) ; | 456 resource = createResourceForLoading(request, request.charset(), factory) ; |
| 457 break; | 457 break; |
| 458 case Revalidate: | 458 case Revalidate: |
| 459 initializeRevalidation(request, resource.get()); | 459 initializeRevalidation(request, resource.get()); |
| 460 break; | 460 break; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 518 { | 518 { |
| 519 WebURLRequest::RequestContext requestContext = requestContextFromType(isMain Frame, type); | 519 WebURLRequest::RequestContext requestContext = requestContextFromType(isMain Frame, type); |
| 520 request.setRequestContext(requestContext); | 520 request.setRequestContext(requestContext); |
| 521 } | 521 } |
| 522 | 522 |
| 523 void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource ::Type type) | 523 void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource ::Type type) |
| 524 { | 524 { |
| 525 determineRequestContext(request, type, context().isMainFrame()); | 525 determineRequestContext(request, type, context().isMainFrame()); |
| 526 } | 526 } |
| 527 | 527 |
| 528 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type) | 528 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type, FetchRequest::DeferOption defer) |
| 529 { | 529 { |
| 530 if (request.getCachePolicy() == UseProtocolCachePolicy) | 530 if (request.getCachePolicy() == UseProtocolCachePolicy) |
| 531 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e)); | 531 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e, defer)); |
| 532 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) | 532 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
| 533 determineRequestContext(request, type); | 533 determineRequestContext(request, type); |
| 534 if (type == Resource::LinkPrefetch) | 534 if (type == Resource::LinkPrefetch) |
| 535 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); | 535 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); |
| 536 | 536 |
| 537 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); | 537 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); |
| 538 } | 538 } |
| 539 | 539 |
| 540 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) | 540 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) |
| 541 { | 541 { |
| 542 ASSERT(resource); | 542 ASSERT(resource); |
| 543 ASSERT(memoryCache()->contains(resource)); | 543 ASSERT(memoryCache()->contains(resource)); |
| 544 ASSERT(resource->isLoaded()); | 544 ASSERT(resource->isLoaded()); |
| 545 ASSERT(resource->canUseCacheValidator()); | 545 ASSERT(resource->canUseCacheValidator()); |
| 546 ASSERT(!resource->isCacheValidator()); | 546 ASSERT(!resource->isCacheValidator()); |
| 547 ASSERT(!context().isControlledByServiceWorker()); | 547 ASSERT(!context().isControlledByServiceWorker()); |
| 548 | 548 |
| 549 ResourceRequest revalidatingRequest(resource->resourceRequest()); | 549 ResourceRequest revalidatingRequest(resource->resourceRequest()); |
| 550 revalidatingRequest.clearHTTPReferrer(); | 550 revalidatingRequest.clearHTTPReferrer(); |
| 551 initializeResourceRequest(revalidatingRequest, resource->getType()); | 551 initializeResourceRequest(revalidatingRequest, resource->getType(), FetchReq uest::NoDefer); |
|
jkarlin
2016/04/06 14:55:31
Why is this NoDefer? Shouldn't this be request.def
shivanisha
2016/04/06 20:40:10
Updating. I initially thought it is a fresh reques
| |
| 552 | 552 |
| 553 const AtomicString& lastModified = resource->response().httpHeaderField(HTTP Names::Last_Modified); | 553 const AtomicString& lastModified = resource->response().httpHeaderField(HTTP Names::Last_Modified); |
| 554 const AtomicString& eTag = resource->response().httpHeaderField(HTTPNames::E Tag); | 554 const AtomicString& eTag = resource->response().httpHeaderField(HTTPNames::E Tag); |
| 555 if (!lastModified.isEmpty() || !eTag.isEmpty()) { | 555 if (!lastModified.isEmpty() || !eTag.isEmpty()) { |
| 556 ASSERT(context().getCachePolicy() != CachePolicyReload); | 556 ASSERT(context().getCachePolicy() != CachePolicyReload); |
| 557 if (context().getCachePolicy() == CachePolicyRevalidate) | 557 if (context().getCachePolicy() == CachePolicyRevalidate) |
| 558 revalidatingRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "ma x-age=0"); | 558 revalidatingRequest.setHTTPHeaderField(HTTPNames::Cache_Control, "ma x-age=0"); |
| 559 } | 559 } |
| 560 if (!lastModified.isEmpty()) | 560 if (!lastModified.isEmpty()) |
| 561 revalidatingRequest.setHTTPHeaderField(HTTPNames::If_Modified_Since, las tModified); | 561 revalidatingRequest.setHTTPHeaderField(HTTPNames::If_Modified_Since, las tModified); |
| (...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1194 visitor->trace(m_loaders); | 1194 visitor->trace(m_loaders); |
| 1195 visitor->trace(m_nonBlockingLoaders); | 1195 visitor->trace(m_nonBlockingLoaders); |
| 1196 #if ENABLE(OILPAN) | 1196 #if ENABLE(OILPAN) |
| 1197 visitor->trace(m_documentResources); | 1197 visitor->trace(m_documentResources); |
| 1198 visitor->trace(m_preloads); | 1198 visitor->trace(m_preloads); |
| 1199 visitor->trace(m_resourceTimingInfoMap); | 1199 visitor->trace(m_resourceTimingInfoMap); |
| 1200 #endif | 1200 #endif |
| 1201 } | 1201 } |
| 1202 | 1202 |
| 1203 } // namespace blink | 1203 } // namespace blink |
| OLD | NEW |