third_party/WebKit/Source/core/fetch/MemoryCacheTest.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/MemoryCacheTest.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/ImageResourceObserver.h ('K') | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/MockImageResourceClient.h » ('j') | third_party/WebKit/Source/core/fetch/Resource.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 07a619774714404d82c68f9537807d233d20eaa7..da9085f462a48f348f056cd36d34613ee4c95ef7 100644

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

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

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

#include "core/fetch/MemoryCache.h"

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

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

#include "core/fetch/RawResource.h"

#include "platform/network/ResourceRequest.h"

#include "platform/testing/UnitTestHelpers.h"

@@ -133,7 +133,7 @@ TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)

ASSERT_EQ(cachedResource->size(), memoryCache()->deadSize());

ASSERT_EQ(0u, memoryCache()->liveSize());

- MockImageResourceClient client(cachedResource);

+ MockResourceClient client(cachedResource);

ASSERT_EQ(0u, memoryCache()->deadSize());

ASSERT_EQ(cachedResource->size(), memoryCache()->liveSize());

@@ -236,7 +236,7 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Re

memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);

const char data[6] = "abcde";

cachedDeadResource->appendData(data, 3u);

- MockImageResourceClient client(cachedLiveResource);

+ MockResourceClient client(cachedLiveResource);

cachedLiveResource->appendData(data, 4u);

Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, bind(&runTask1, PassRefPtrWillBeRawPtr<Resource>(cachedLiveResource), PassRefPtrWillBeRawPtr<Resource>(cachedDeadResource)));

@@ -292,9 +292,9 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)

static void TestClientRemoval(Resource* resource1, Resource* resource2)

{

const char data[6] = "abcde";

- MockImageResourceClient client1(resource1);

+ MockResourceClient client1(resource1);

resource1->appendData(data, 4u);

- MockImageResourceClient client2(resource2);

+ MockResourceClient client2(resource2);

resource2->appendData(data, 4u);

const unsigned minDeadCapacity = 0;