Changeset 80036 in webkit
- Timestamp:
- Mar 1, 2011 1:57:14 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80032 r80036 1 2011-03-01 Michael Nordman <michaeln@google.com> 2 3 Reviewed by Alexey Proskuryakov. 4 5 Tests for the correct relative priorities of network vs fallback namespaces in the appcache. 6 If a resource url is in an appcache's network namespace and fallback namespace, the network 7 namespace wins (with the exception of the special '*' network namespace which does not take 8 priority over the fallback namespace. 9 https://bugs.webkit.org/show_bug.cgi?id=49292 10 11 * http/tests/appcache/online-fallback-layering-expected.txt: Added. 12 * http/tests/appcache/online-fallback-layering.html: Added. 13 * http/tests/appcache/resources/fallbacknamespace-fallback-resource.txt: Added. 14 * http/tests/appcache/resources/fallbacknamespace-networknamespace-existing-resource.html: Added. 15 * http/tests/appcache/resources/online-fallback-layering.manifest: Added. 16 1 17 2011-03-01 Tony Gentilcore <tonyg@chromium.org> 2 18 -
trunk/Source/WebCore/ChangeLog
r80034 r80036 1 2011-03-01 Michael Nordman <michaeln@google.com> 2 3 Reviewed by Alexey Proskuryakov. 4 5 Alter the relative priorities of network vs fallback namespaces in the appcache. 6 If a resource url is in an appcache's network namespace and fallback namespace, the network 7 namespace wins (with the exception of the special '*' network namespace which does not take 8 priority over the fallback namespace. 9 https://bugs.webkit.org/show_bug.cgi?id=49292 10 11 Test: http/tests/appcache/online-fallback-layering.html 12 13 * loader/appcache/ApplicationCache.cpp: 14 (WebCore::ApplicationCache::isURLInOnlineWhitelist): 15 * loader/appcache/ApplicationCacheHost.cpp: 16 (WebCore::ApplicationCacheHost::shouldLoadResourceFromApplicationCache): 17 (WebCore::ApplicationCacheHost::getApplicationCacheFallbackResource): 18 * loader/appcache/ApplicationCacheStorage.cpp: 19 (WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL): 20 1 21 2011-03-01 Patrick Gansterer <paroga@webkit.org> 2 22 -
trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp
r65478 r80036 149 149 bool ApplicationCache::isURLInOnlineWhitelist(const KURL& url) 150 150 { 151 if (m_allowAllNetworkRequests)152 return true;153 154 151 size_t whitelistSize = m_onlineWhitelist.size(); 155 152 for (size_t i = 0; i < whitelistSize; ++i) { -
trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
r70923 r80036 351 351 // Resources that match fallback namespaces or online whitelist entries are fetched from the network, 352 352 // unless they are also cached. 353 if (!resource && (cache-> urlMatchesFallbackNamespace(request.url()) || cache->isURLInOnlineWhitelist(request.url())))353 if (!resource && (cache->allowsAllNetworkRequests() || cache->urlMatchesFallbackNamespace(request.url()) || cache->isURLInOnlineWhitelist(request.url()))) 354 354 return false; 355 355 … … 374 374 375 375 KURL fallbackURL; 376 if (cache->isURLInOnlineWhitelist(request.url())) 377 return false; 376 378 if (!cache->urlMatchesFallbackNamespace(request.url(), &fallbackURL)) 377 379 return false; -
trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp
r79368 r80036 268 268 if (ApplicationCache* cache = group->newestCache()) { 269 269 KURL fallbackURL; 270 if (cache->isURLInOnlineWhitelist(url)) 271 continue; 270 272 if (!cache->urlMatchesFallbackNamespace(url, &fallbackURL)) 271 273 continue; … … 301 303 302 304 KURL fallbackURL; 305 if (cache->isURLInOnlineWhitelist(url)) 306 continue; 303 307 if (!cache->urlMatchesFallbackNamespace(url, &fallbackURL)) 304 308 continue;
Note: See TracChangeset
for help on using the changeset viewer.