third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp - Issue 1706083002: Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 1706083002: Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reflect comments and Rebase Created 4 years, 9 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

« third_party/WebKit/Source/core/fetch/ResourceClientWalker.h ('K') | « third_party/WebKit/Source/core/fetch/ResourceClientWalker.h ('k') | third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp » ('j') | third_party/WebKit/Source/core/layout/LayoutImage.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

index f7cd97d2d74b1e8baa52602f56d6fa1d452bc305..4645712450f2a148589d686df83eb60c40276817 100644

--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

@@ -380,7 +380,7 @@ void ResourceFetcher::updateMemoryCacheStats(Resource* resource, RevalidationPol

// would be dead if MemoryCache holds weak references to Resource).

// Currently we check references to Resource from ResourceClient and

// |m_preloads| only, because they are major sources of references.

- if (resource && !resource->hasClients() && (!m_preloads || !m_preloads->contains(resource))) {

+ if (resource && !resource->hasClientsOrObservers() && (!m_preloads || !m_preloads->contains(resource))) {

DEFINE_RESOURCE_HISTOGRAM("Dead.");

}

@@ -459,7 +459,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&

return nullptr;

}

- if (!resource->hasClients())

+ if (!resource->hasClientsOrObservers())

m_deadStatsRecorder.update(policy);

if (policy != Use)

@@ -1094,7 +1094,7 @@ void ResourceFetcher::updateAllImageResourcePriorities()

if (!resource->isImage())

continue;

- ResourcePriority resourcePriority = resource->priorityFromClients();

+ ResourcePriority resourcePriority = resource->priorityFromObservers();

ResourceLoadPriority resourceLoadPriority = loadPriority(Resource::Image, FetchRequest(resource->resourceRequest(), FetchInitiatorInfo()), resourcePriority.visibility);

if (resourceLoadPriority == resource->resourceRequest().priority())

continue;