Source/WebCore/loader/cache/CachedResourceLoader.h - Issue 7542020: Merge 91725 - REGRESSION (r39725?): Resources removed from document can not be freed until the do...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/loader/cache/CachedResourceLoader.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, 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

Index: Source/WebCore/loader/cache/CachedResourceLoader.h

===================================================================

--- Source/WebCore/loader/cache/CachedResourceLoader.h (revision 92201)

+++ Source/WebCore/loader/cache/CachedResourceLoader.h (working copy)

@@ -30,7 +30,6 @@

#include "CachedResourceHandle.h"

#include "CachePolicy.h"

#include "ResourceLoadPriority.h"

-#include "Timer.h"

#include <wtf/Deque.h>

#include <wtf/HashMap.h>

#include <wtf/HashSet.h>

@@ -118,7 +117,6 @@

void notifyLoadedFromMemoryCache(CachedResource*);

bool canRequest(CachedResource::Type, const KURL&, bool forPreload = false);

- void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>*);

void performPostLoadActions();

HashSet<String> m_validatedURLs;

@@ -135,8 +133,6 @@

};

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 »