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

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

Patch Set: 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

« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResourceObserver.h ('k') | third_party/WebKit/Source/core/fetch/MemoryCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c3ecd5317d2ca119288196f922b4d9c03855dd30..4e7a5701fe15293f712ab71c36a14e44ac365363 100644

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

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

@@ -30,9 +30,8 @@

#include "core/fetch/ImageResource.h"

-#include "core/fetch/ImageResourceClient.h"

#include "core/fetch/MemoryCache.h"

-#include "core/fetch/MockImageResourceClient.h"

+#include "core/fetch/MockResourceClients.h"

#include "core/fetch/ResourceFetcher.h"

#include "core/fetch/ResourceLoader.h"

#include "core/fetch/UniqueIdentifier.h"

@@ -195,14 +194,14 @@ TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)

// The prune comes when the ImageResource still has clients. The image should not be deleted.

cachedImage->prune();

- ASSERT_TRUE(cachedImage->hasClients());

+ ASSERT_TRUE(cachedImage->hasClientsOrObservers());

ASSERT_TRUE(cachedImage->hasImage());

ASSERT_FALSE(cachedImage->getImage()->isNull());

// The ImageResource no longer has clients. The image should be deleted by prune.

client.removeAsClient();

cachedImage->prune();

- ASSERT_FALSE(cachedImage->hasClients());

+ ASSERT_FALSE(cachedImage->hasClientsOrObservers());

ASSERT_FALSE(cachedImage->hasImage());

ASSERT_TRUE(cachedImage->getImage()->isNull());

}