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

Unified Diff: Source/WebCore/loader/cache/CachedResourceLoader.h

Issue 7548016: Merge 92143 - .: REGRESSION (r39725?): Resources removed from document can not be freed until the... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/loader/cache/CachedResource.h ('k') | Source/WebCore/loader/cache/CachedResourceLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/cache/CachedResourceLoader.h
===================================================================
--- Source/WebCore/loader/cache/CachedResourceLoader.h (revision 92202)
+++ Source/WebCore/loader/cache/CachedResourceLoader.h (working copy)
@@ -30,6 +30,7 @@
#include "CachedResourceHandle.h"
#include "CachePolicy.h"
#include "ResourceLoadPriority.h"
+#include "Timer.h"
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
@@ -117,6 +118,7 @@
void notifyLoadedFromMemoryCache(CachedResource*);
bool canRequest(CachedResource::Type, const KURL&, bool forPreload = false);
+ void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>*);
void performPostLoadActions();
HashSet<String> m_validatedURLs;
@@ -133,6 +135,8 @@
};
Deque<PendingPreload> m_pendingPreloads;
+ Timer<CachedResourceLoader> m_garbageCollectDocumentResourcesTimer;
+
//29 bits left
bool m_autoLoadImages : 1;
bool m_loadFinishing : 1;
« no previous file with comments | « Source/WebCore/loader/cache/CachedResource.h ('k') | Source/WebCore/loader/cache/CachedResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698