From 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 13 Sep 2010 16:35:48 +0100 Subject: Merge WebKit at r67178 : Initial merge by git. Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18 --- WebCore/loader/Cache.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'WebCore/loader/Cache.h') diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h index ce8cde4..9d7e8be 100644 --- a/WebCore/loader/Cache.h +++ b/WebCore/loader/Cache.h @@ -39,7 +39,7 @@ namespace WebCore { class CachedCSSStyleSheet; class CachedResource; -class DocLoader; +class CachedResourceLoader; class KURL; // This cache holds subresources used by Web pages: images, scripts, stylesheets, etc. @@ -93,11 +93,11 @@ public: // Request resources from the cache. A load will be initiated and a cache object created if the object is not // found in the cache. - CachedResource* requestResource(DocLoader*, CachedResource::Type, const KURL& url, const String& charset, bool isPreload = false); + CachedResource* requestResource(CachedResourceLoader*, CachedResource::Type, const KURL& url, const String& charset, bool isPreload = false); - CachedCSSStyleSheet* requestUserCSSStyleSheet(DocLoader*, const String& url, const String& charset); + CachedCSSStyleSheet* requestUserCSSStyleSheet(CachedResourceLoader*, const String& url, const String& charset); - void revalidateResource(CachedResource*, DocLoader*); + void revalidateResource(CachedResource*, CachedResourceLoader*); void revalidationSucceeded(CachedResource* revalidatingResource, const ResourceResponse&); void revalidationFailed(CachedResource* revalidatingResource); @@ -129,8 +129,8 @@ public: // Remove an existing cache entry from both the resource map and from the LRU list. void remove(CachedResource* resource) { evict(resource); } - void addDocLoader(DocLoader*); - void removeDocLoader(DocLoader*); + void addCachedResourceLoader(CachedResourceLoader*); + void removeCachedResourceLoader(CachedResourceLoader*); CachedResource* resourceForURL(const String&); @@ -176,7 +176,7 @@ private: void evict(CachedResource*); // Member variables. - HashSet m_docLoaders; + HashSet m_cachedResourceLoaders; Loader m_loader; bool m_disabled; // Whether or not the cache is enabled. -- cgit v1.1