diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/loader/cache/CachedResource.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/loader/cache/CachedResource.h')
| -rw-r--r-- | Source/WebCore/loader/cache/CachedResource.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |