Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/MockImageResourceClient.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 4facb09bb65041718f6f60689f2ace02544e88c2..f2748f49a15d65d227664f437e64c849790adde2 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
@@ -44,9 +44,9 @@ class MemoryCacheTest : public ::testing::Test {
public:
class FakeDecodedResource : public Resource {
public:
- static RefPtrWillBeRawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
+ static RawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
{
- return adoptRefWillBeNoop(new FakeDecodedResource(request, type));
+ return (new FakeDecodedResource(request, type));
}
virtual void appendData(const char* data, size_t len)
@@ -69,9 +69,9 @@ public:
class FakeResource : public Resource {
public:
- static RefPtrWillBeRawPtr<FakeResource> create(const ResourceRequest& request, Type type)
+ static RawPtr<FakeResource> create(const ResourceRequest& request, Type type)
{
- return adoptRefWillBeNoop(new FakeResource(request, type));
+ return (new FakeResource(request, type));
}
void fakeEncodedSize(size_t size)
@@ -123,7 +123,7 @@ TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)
const size_t resourceSize1 = sizeMax / 16;
const size_t resourceSize2 = sizeMax / 20;
memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
- RefPtrWillBeRawPtr<FakeResource> cachedResource =
+ RawPtr<FakeResource> cachedResource =
FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedResource->fakeEncodedSize(resourceSize1);
@@ -180,18 +180,18 @@ static void TestDeadResourceEviction(Resource* resource1, Resource* resource2)
TEST_F(MemoryCacheTest, DeadResourceEviction_Basic)
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
TestDeadResourceEviction(resource1.get(), resource2.get());
}
TEST_F(MemoryCacheTest, DeadResourceEviction_MultipleResourceMaps)
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
resource2->setCacheIdentifier("foo");
TestDeadResourceEviction(resource1.get(), resource2.get());
@@ -240,8 +240,8 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Re
}
private:
- RefPtrWillBePersistent<Resource> m_live;
- RefPtrWillBePersistent<Resource> m_dead;
+ Persistent<Resource> m_live;
+ Persistent<Resource> m_dead;
};
class Task2 : public WebTaskRunner::Task {
@@ -270,9 +270,9 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Re
// is deferred to the end of the task.
TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_Basic)
{
- RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ RawPtr<Resource> cachedDeadResource =
Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ RawPtr<Resource> cachedLiveResource =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
}
@@ -280,28 +280,28 @@ TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_Basic)
TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)
{
{
- RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ RawPtr<Resource> cachedDeadResource =
Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
cachedDeadResource->setCacheIdentifier("foo");
- RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ RawPtr<Resource> cachedLiveResource =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ RawPtr<Resource> cachedDeadResource =
Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ RawPtr<Resource> cachedLiveResource =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedLiveResource->setCacheIdentifier("foo");
TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ RawPtr<Resource> cachedDeadResource =
Resource::create(ResourceRequest("hhtp://test/resource"), Resource::Raw);
cachedDeadResource->setCacheIdentifier("foo");
- RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ RawPtr<Resource> cachedLiveResource =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedLiveResource->setCacheIdentifier("bar");
TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
@@ -356,9 +356,9 @@ static void TestClientRemoval(Resource* resource1, Resource* resource2)
TEST_F(MemoryCacheTest, ClientRemoval_Basic)
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
TestClientRemoval(resource1.get(), resource2.get());
}
@@ -366,28 +366,28 @@ TEST_F(MemoryCacheTest, ClientRemoval_Basic)
TEST_F(MemoryCacheTest, ClientRemoval_MultipleResourceMaps)
{
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
resource1->setCacheIdentifier("foo");
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
TestClientRemoval(resource1.get(), resource2.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("foo");
TestClientRemoval(resource1.get(), resource2.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<Resource> resource1 =
+ RawPtr<Resource> resource1 =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource1->setCacheIdentifier("foo");
- RefPtrWillBeRawPtr<Resource> resource2 =
+ RawPtr<Resource> resource2 =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("bar");
TestClientRemoval(resource1.get(), resource2.get());
@@ -457,9 +457,9 @@ static void TestDecodeCacheOrder(Resource* cachedImageLowPriority, Resource* cac
TEST_F(MemoryCacheTest, DecodeCacheOrder_Basic)
{
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ RawPtr<FakeDecodedResource> cachedImageLowPriority =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ RawPtr<FakeDecodedResource> cachedImageHighPriority =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
}
@@ -467,28 +467,28 @@ TEST_F(MemoryCacheTest, DecodeCacheOrder_Basic)
TEST_F(MemoryCacheTest, DecodeCacheOrder_MultipleResourceMaps)
{
{
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ RawPtr<FakeDecodedResource> cachedImageLowPriority =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ RawPtr<FakeDecodedResource> cachedImageHighPriority =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageLowPriority->setCacheIdentifier("foo");
TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ RawPtr<FakeDecodedResource> cachedImageLowPriority =
FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ RawPtr<FakeDecodedResource> cachedImageHighPriority =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageHighPriority->setCacheIdentifier("foo");
TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
memoryCache()->evictResources();
}
{
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ RawPtr<FakeDecodedResource> cachedImageLowPriority =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageLowPriority->setCacheIdentifier("foo");
- RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ RawPtr<FakeDecodedResource> cachedImageHighPriority =
FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageHighPriority->setCacheIdentifier("bar");
TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
@@ -498,16 +498,16 @@ TEST_F(MemoryCacheTest, DecodeCacheOrder_MultipleResourceMaps)
TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
{
- RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->add(resource1.get());
- RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->remove(resource1.get());
memoryCache()->add(resource2.get());
EXPECT_TRUE(memoryCache()->contains(resource2.get()));
EXPECT_FALSE(memoryCache()->contains(resource1.get()));
- RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->remove(resource2.get());
memoryCache()->add(resource3.get());
EXPECT_TRUE(memoryCache()->contains(resource3.get()));
@@ -516,10 +516,10 @@ TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
TEST_F(MemoryCacheTest, ResourceMapIsolation)
{
- RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->add(resource1.get());
- RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("foo");
memoryCache()->add(resource2.get());
EXPECT_TRUE(memoryCache()->contains(resource1.get()));
@@ -531,7 +531,7 @@ TEST_F(MemoryCacheTest, ResourceMapIsolation)
EXPECT_EQ(resource2.get(), memoryCache()->resourceForURL(url, "foo"));
EXPECT_EQ(0, memoryCache()->resourceForURL(KURL()));
- RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ RawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource3->setCacheIdentifier("foo");
memoryCache()->remove(resource2.get());
memoryCache()->add(resource3.get());
@@ -539,7 +539,7 @@ TEST_F(MemoryCacheTest, ResourceMapIsolation)
EXPECT_FALSE(memoryCache()->contains(resource2.get()));
EXPECT_TRUE(memoryCache()->contains(resource3.get()));
- WillBeHeapVector<RawPtrWillBeMember<Resource>> resources = memoryCache()->resourcesForURL(url);
+ HeapVector<Member<Resource>> resources = memoryCache()->resourcesForURL(url);
EXPECT_EQ(2u, resources.size());
memoryCache()->evictResources();
« third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/MockImageResourceClient.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')

Powered by Google App Engine
This is Rietveld 408576698