| Index: Source/WebCore/loader/cache/CachedResourceLoader.cpp
|
| diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
|
| index e5dd43eb5411070bdc0400ab28bb9b0971ae1827..639de3b730e286ea430bacf08a77b179ff2cb830 100644
|
| --- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
|
| +++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
|
| @@ -311,7 +311,7 @@ bool CachedResourceLoader::canRequest(CachedResource::Type type, const KURL& url
|
| if (document() && !document()->securityOrigin()->canDisplay(url)) {
|
| if (!forPreload)
|
| FrameLoader::reportLocalLoadFailed(frame(), url.elidedString());
|
| - LOG(ResourceLoading, "CachedResourceLoader::requestResource URL was not allowed by SecurityOrigin::canDisplay");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::requestResource URL was not allowed by SecurityOrigin::canDisplay");
|
| return 0;
|
| }
|
|
|
| @@ -425,7 +425,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::requestResource(Cache
|
| {
|
| KURL url = request.resourceRequest().url();
|
|
|
| - LOG(ResourceLoading, "CachedResourceLoader::requestResource '%s', charset '%s', priority=%d, forPreload=%u", url.elidedString().latin1().data(), request.charset().latin1().data(), request.priority(), request.forPreload());
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::requestResource '%s', charset '%s', priority=%d, forPreload=%u", url.elidedString().latin1().data(), request.charset().latin1().data(), request.priority(), request.forPreload());
|
|
|
| // If only the fragment identifiers differ, it is the same resource.
|
| url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
|
| @@ -522,7 +522,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(co
|
| String url = resource->url();
|
| CachedResourceHandle<CachedResource> newResource = createResource(resource->type(), resource->resourceRequest(), resource->encoding());
|
|
|
| - LOG(ResourceLoading, "Resource %p created to revalidate %p", newResource.get(), resource);
|
| + LOG_INFO(ResourceLoading, "Resource %p created to revalidate %p", newResource.get(), resource);
|
| newResource->setResourceToRevalidate(resource);
|
|
|
| memoryCache()->remove(resource);
|
| @@ -539,7 +539,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::loadResource(CachedRe
|
| {
|
| ASSERT(!memoryCache()->resourceForRequest(request.resourceRequest()));
|
|
|
| - LOG(ResourceLoading, "Loading CachedResource for '%s'.", request.resourceRequest().url().elidedString().latin1().data());
|
| + LOG_INFO(ResourceLoading, "Loading CachedResource for '%s'.", request.resourceRequest().url().elidedString().latin1().data());
|
|
|
| CachedResourceHandle<CachedResource> resource = createResource(type, request.mutableResourceRequest(), charset);
|
|
|
| @@ -578,7 +578,7 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida
|
|
|
| // If the same URL has been loaded as a different type, we need to reload.
|
| if (existingResource->type() != type) {
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to type mismatch.");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to type mismatch.");
|
| return Reload;
|
| }
|
|
|
| @@ -610,7 +610,7 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida
|
|
|
| // Don't reuse resources with Cache-control: no-store.
|
| if (existingResource->response().cacheControlContainsNoStore()) {
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to Cache-control: no-store.");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to Cache-control: no-store.");
|
| return Reload;
|
| }
|
|
|
| @@ -621,7 +621,7 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida
|
| // "Access-Control-Allow-Origin: *" all the time, but some of the
|
| // client's requests are made without CORS and some with.
|
| if (existingResource->resourceRequest().allowCookies() != request.allowCookies()) {
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to difference in credentials settings.");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to difference in credentials settings.");
|
| return Reload;
|
| }
|
|
|
| @@ -631,13 +631,13 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida
|
|
|
| // CachePolicyReload always reloads
|
| if (cachePolicy(type) == CachePolicyReload) {
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to CachePolicyReload.");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to CachePolicyReload.");
|
| return Reload;
|
| }
|
|
|
| // We'll try to reload the resource if it failed last time.
|
| if (existingResource->errorOccurred()) {
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicye reloading due to resource being in the error state");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicye reloading due to resource being in the error state");
|
| return Reload;
|
| }
|
|
|
| @@ -652,7 +652,7 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida
|
| return Revalidate;
|
|
|
| // No, must reload.
|
| - LOG(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to missing cache validators.");
|
| + LOG_INFO(ResourceLoading, "CachedResourceLoader::determineRevalidationPolicy reloading due to missing cache validators.");
|
| return Reload;
|
| }
|
|
|
|
|