Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: Source/WebCore/loader/cache/CachedResource.h

Issue 7542020: Merge 91725 - REGRESSION (r39725?): Resources removed from document can not be freed until the do... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/loader/cache/CachedResourceLoader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org> 3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 // Caches the given metadata in association with this resource and suggests 176 // Caches the given metadata in association with this resource and suggests
177 // that the platform persist it. The dataTypeID is a pseudo-randomly chosen 177 // that the platform persist it. The dataTypeID is a pseudo-randomly chosen
178 // identifier that is used to distinguish data generated by the caller. 178 // identifier that is used to distinguish data generated by the caller.
179 void setCachedMetadata(unsigned dataTypeID, const char*, size_t); 179 void setCachedMetadata(unsigned dataTypeID, const char*, size_t);
180 180
181 // Returns cached metadata of the given type associated with this resource. 181 // Returns cached metadata of the given type associated with this resource.
182 CachedMetadata* cachedMetadata(unsigned dataTypeID) const; 182 CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
183 183
184 bool canDelete() const { return !hasClients() && !m_request && !m_preloadCou nt && !m_handleCount && !m_resourceToRevalidate && !m_proxyResource; } 184 bool canDelete() const { return !hasClients() && !m_request && !m_preloadCou nt && !m_handleCount && !m_resourceToRevalidate && !m_proxyResource; }
185 bool hasOneHandle() const { return m_handleCount == 1; }
186 185
187 bool isExpired() const; 186 bool isExpired() const;
188 187
189 // List of acceptable MIME types separated by ",". 188 // List of acceptable MIME types separated by ",".
190 // A MIME type may contain a wildcard, e.g. "text/*". 189 // A MIME type may contain a wildcard, e.g. "text/*".
191 String accept() const { return m_accept; } 190 String accept() const { return m_accept; }
192 void setAccept(const String& accept) { m_accept = accept; } 191 void setAccept(const String& accept) { m_accept = accept; }
193 192
194 bool wasCanceled() const { return m_status == Canceled; } 193 bool wasCanceled() const { return m_status == Canceled; }
195 bool errorOccurred() const { return (m_status == LoadError || m_status == De codeError); } 194 bool errorOccurred() const { return (m_status == LoadError || m_status == De codeError); }
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 // If this field is non-null, the resource has a proxy for checking whether it is still up to date (see m_resourceToRevalidate). 299 // If this field is non-null, the resource has a proxy for checking whether it is still up to date (see m_resourceToRevalidate).
301 CachedResource* m_proxyResource; 300 CachedResource* m_proxyResource;
302 301
303 // These handles will need to be updated to point to the m_resourceToRevalid ate in case we get 304 response. 302 // These handles will need to be updated to point to the m_resourceToRevalid ate in case we get 304 response.
304 HashSet<CachedResourceHandleBase*> m_handlesToRevalidate; 303 HashSet<CachedResourceHandleBase*> m_handlesToRevalidate;
305 }; 304 };
306 305
307 } 306 }
308 307
309 #endif 308 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/loader/cache/CachedResourceLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698