Source/core/fetch/Resource.cpp - Issue 640463003: MemoryCache: Enable MemoryCache to have multiple isolated resource maps

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/core/fetch/Resource.cpp

Issue 640463003: MemoryCache: Enable MemoryCache to have multiple isolated resource maps (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: remake Created 6 years, 2 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/core/fetch/Resource.cpp

diff --git a/Source/core/fetch/Resource.cpp b/Source/core/fetch/Resource.cpp

index 062d594c43e8a32c02e198c79e397c36fb02dd3a..aa52f40d35f15d86f7de2089ac7bcc07adf74045 100644

--- a/Source/core/fetch/Resource.cpp

+++ b/Source/core/fetch/Resource.cpp

@@ -106,6 +106,7 @@ Resource::Resource(const ResourceRequest& request, Type type)

, m_handleCount(0)

, m_preloadCount(0)

, m_protectorCount(0)

+ , m_cacheIdentifier(MemoryCache::defaultCacheIdentifier())

, m_preloadResult(PreloadNotReferenced)

, m_requestedFromNetworkingLayer(false)

, m_loading(false)

@@ -142,7 +143,6 @@ Resource::~Resource()

ASSERT(canDelete());

RELEASE_ASSERT(!memoryCache()->contains(this));

RELEASE_ASSERT(!ResourceCallback::callbackHandler()->isScheduled(this));

- ASSERT(url().isNull() || memoryCache()->resourceForURL(KURL(ParsedURLString, url())) != this);

Mike West 2014/10/24 12:43:00 Why is it safe to drop this ASSERT?

nhiroki 2014/10/27 14:30:13 This case would be covered by ASSERT(!memoryCache(

assertAlive();

#ifdef ENABLE_RESOURCE_IS_DELETED_CHECK

« Source/core/fetch/MemoryCache.cpp ('K') | « Source/core/fetch/Resource.h ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | Source/core/fetch/ResourceFetcher.cpp » ('J')