From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/loader/cache/CachedResource.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/loader/cache/CachedResource.h') diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h index 16920a5..72b00e5 100644 --- a/Source/WebCore/loader/cache/CachedResource.h +++ b/Source/WebCore/loader/cache/CachedResource.h @@ -65,7 +65,7 @@ public: , XSLStyleSheet #endif #if ENABLE(LINK_PREFETCH) - , LinkPrefetch + , LinkResource #endif }; @@ -129,10 +129,10 @@ public: void setLoading(bool b) { m_loading = b; } virtual bool isImage() const { return false; } - bool isPrefetch() const + bool isLinkResource() const { #if ENABLE(LINK_PREFETCH) - return type() == LinkPrefetch; + return type() == LinkResource; #else return false; #endif -- cgit v1.1