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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + address review comments 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
« no previous file with comments | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/MockImageResourceClient.h » ('j') | no next file with comments »
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 a2430bbaf6716975277eacb6bcce07bd0f87b8cb..4facb09bb65041718f6f60689f2ace02544e88c2 100644
--- a/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp
@@ -32,7 +32,6 @@
#include "core/fetch/MockImageResourceClient.h"
#include "core/fetch/RawResource.h"
-#include "core/fetch/ResourcePtr.h"
#include "platform/network/ResourceRequest.h"
#include "platform/testing/UnitTestHelpers.h"
#include "public/platform/Platform.h"
@@ -45,9 +44,9 @@ class MemoryCacheTest : public ::testing::Test {
public:
class FakeDecodedResource : public Resource {
public:
- FakeDecodedResource(const ResourceRequest& request, Type type)
- : Resource(request, type)
+ static RefPtrWillBeRawPtr<FakeDecodedResource> create(const ResourceRequest& request, Type type)
{
+ return adoptRefWillBeNoop(new FakeDecodedResource(request, type));
}
virtual void appendData(const char* data, size_t len)
@@ -57,6 +56,11 @@ public:
}
protected:
+ FakeDecodedResource(const ResourceRequest& request, Type type)
+ : Resource(request, type)
+ {
+ }
+
void destroyDecodedDataIfPossible() override
{
setDecodedSize(0);
@@ -65,15 +69,21 @@ public:
class FakeResource : public Resource {
public:
- FakeResource(const ResourceRequest& request, Type type)
- : Resource(request, type)
+ static RefPtrWillBeRawPtr<FakeResource> create(const ResourceRequest& request, Type type)
{
+ return adoptRefWillBeNoop(new FakeResource(request, type));
}
void fakeEncodedSize(size_t size)
{
setEncodedSize(size);
}
+
+ private:
+ FakeResource(const ResourceRequest& request, Type type)
+ : Resource(request, type)
+ {
+ }
};
protected:
@@ -113,8 +123,8 @@ TEST_F(MemoryCacheTest, VeryLargeResourceAccounting)
const size_t resourceSize1 = sizeMax / 16;
const size_t resourceSize2 = sizeMax / 20;
memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
- ResourcePtr<FakeResource> cachedResource =
- new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> cachedResource =
+ FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedResource->fakeEncodedSize(resourceSize1);
ASSERT_EQ(0u, memoryCache()->deadSize());
@@ -170,24 +180,24 @@ static void TestDeadResourceEviction(Resource* resource1, Resource* resource2)
TEST_F(MemoryCacheTest, DeadResourceEviction_Basic)
{
- Resource* resource1 =
- new Resource(ResourceRequest("http://test/resource1"), Resource::Raw);
- Resource* resource2 =
- new Resource(ResourceRequest("http://test/resource2"), Resource::Raw);
- TestDeadResourceEviction(resource1, resource2);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
+ TestDeadResourceEviction(resource1.get(), resource2.get());
}
TEST_F(MemoryCacheTest, DeadResourceEviction_MultipleResourceMaps)
{
- Resource* resource1 =
- new Resource(ResourceRequest("http://test/resource1"), Resource::Raw);
- Resource* resource2 =
- new Resource(ResourceRequest("http://test/resource2"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ Resource::create(ResourceRequest("http://test/resource1"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ Resource::create(ResourceRequest("http://test/resource2"), Resource::Raw);
resource2->setCacheIdentifier("foo");
- TestDeadResourceEviction(resource1, resource2);
+ TestDeadResourceEviction(resource1.get(), resource2.get());
}
-static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, const ResourcePtr<Resource>& cachedLiveResource)
+static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, Resource* cachedLiveResource)
{
memoryCache()->setDelayBeforeLiveDecodedPrune(0);
const unsigned totalCapacity = 1;
@@ -201,7 +211,7 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, co
class Task1 : public WebTaskRunner::Task {
public:
- Task1(const ResourcePtr<Resource>& live, Resource* dead)
+ Task1(Resource* live, Resource* dead)
: m_live(live)
, m_dead(dead)
{ }
@@ -216,7 +226,7 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, co
ASSERT_EQ(0u, memoryCache()->deadSize());
ASSERT_EQ(0u, memoryCache()->liveSize());
- memoryCache()->add(m_dead);
+ memoryCache()->add(m_dead.get());
memoryCache()->add(m_live.get());
memoryCache()->updateDecodedResource(m_live.get(), UpdateForPropertyChange);
ASSERT_EQ(m_dead->size(), memoryCache()->deadSize());
@@ -230,8 +240,8 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, co
}
private:
- ResourcePtr<Resource> m_live;
- RawPtrWillBePersistent<Resource> m_dead;
+ RefPtrWillBePersistent<Resource> m_live;
+ RefPtrWillBePersistent<Resource> m_dead;
};
class Task2 : public WebTaskRunner::Task {
@@ -260,48 +270,48 @@ static void TestLiveResourceEvictionAtEndOfTask(Resource* cachedDeadResource, co
// is deferred to the end of the task.
TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_Basic)
{
- Resource* cachedDeadResource =
- new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
- ResourcePtr<Resource> cachedLiveResource =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
- TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+ RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
}
TEST_F(MemoryCacheTest, LiveResourceEvictionAtEndOfTask_MultipleResourceMaps)
{
{
- Resource* cachedDeadResource =
- new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
cachedDeadResource->setCacheIdentifier("foo");
- ResourcePtr<Resource> cachedLiveResource =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
- TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+ RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
memoryCache()->evictResources();
}
{
- Resource* cachedDeadResource =
- new Resource(ResourceRequest("hhtp://foo"), Resource::Raw);
- ResourcePtr<Resource> cachedLiveResource =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ Resource::create(ResourceRequest("hhtp://foo"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedLiveResource->setCacheIdentifier("foo");
- TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+ TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
memoryCache()->evictResources();
}
{
- Resource* cachedDeadResource =
- new Resource(ResourceRequest("hhtp://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedDeadResource =
+ Resource::create(ResourceRequest("hhtp://test/resource"), Resource::Raw);
cachedDeadResource->setCacheIdentifier("foo");
- ResourcePtr<Resource> cachedLiveResource =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> cachedLiveResource =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedLiveResource->setCacheIdentifier("bar");
- TestLiveResourceEvictionAtEndOfTask(cachedDeadResource, cachedLiveResource);
+ TestLiveResourceEvictionAtEndOfTask(cachedDeadResource.get(), cachedLiveResource.get());
memoryCache()->evictResources();
}
}
// Verifies that cached resources are evicted immediately after release when
// the total dead resource size is more than double the dead resource capacity.
-static void TestClientRemoval(const ResourcePtr<Resource>& resource1, const ResourcePtr<Resource>& resource2)
+static void TestClientRemoval(Resource* resource1, Resource* resource2)
{
const char data[6] = "abcde";
MockImageResourceClient client1(resource1);
@@ -313,8 +323,8 @@ static void TestClientRemoval(const ResourcePtr<Resource>& resource1, const Reso
const unsigned maxDeadCapacity = ((resource1->size() + resource2->size()) / 2) - 1;
const unsigned totalCapacity = maxDeadCapacity;
memoryCache()->setCapacities(minDeadCapacity, maxDeadCapacity, totalCapacity);
- memoryCache()->add(resource1.get());
- memoryCache()->add(resource2.get());
+ memoryCache()->add(resource1);
+ memoryCache()->add(resource2);
// Call prune. There is nothing to prune, but this will initialize
// the prune timestamp, allowing future prunes to be deferred.
memoryCache()->prune();
@@ -330,8 +340,8 @@ static void TestClientRemoval(const ResourcePtr<Resource>& resource1, const Reso
ASSERT_GT(resource2->decodedSize(), 0u);
ASSERT_EQ(memoryCache()->deadSize(), resource1->size());
ASSERT_EQ(memoryCache()->liveSize(), resource2->size());
- ASSERT_TRUE(memoryCache()->contains(resource1.get()));
- ASSERT_TRUE(memoryCache()->contains(resource2.get()));
+ ASSERT_TRUE(memoryCache()->contains(resource1));
+ ASSERT_TRUE(memoryCache()->contains(resource2));
// Removing the client from resource2 should result in immediate
// eviction of resource2 because we are over the prune deferral limit.
@@ -340,54 +350,54 @@ static void TestClientRemoval(const ResourcePtr<Resource>& resource1, const Reso
ASSERT_GT(resource2->decodedSize(), 0u);
ASSERT_EQ(memoryCache()->deadSize(), resource1->size());
ASSERT_EQ(memoryCache()->liveSize(), 0u);
- ASSERT_TRUE(memoryCache()->contains(resource1.get()));
- ASSERT_FALSE(memoryCache()->contains(resource2.get()));
+ ASSERT_TRUE(memoryCache()->contains(resource1));
+ ASSERT_FALSE(memoryCache()->contains(resource2));
}
TEST_F(MemoryCacheTest, ClientRemoval_Basic)
{
- ResourcePtr<Resource> resource1 =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
- ResourcePtr<Resource> resource2 =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
- TestClientRemoval(resource1, resource2);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ TestClientRemoval(resource1.get(), resource2.get());
}
TEST_F(MemoryCacheTest, ClientRemoval_MultipleResourceMaps)
{
{
- ResourcePtr<Resource> resource1 =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
resource1->setCacheIdentifier("foo");
- ResourcePtr<Resource> resource2 =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
- TestClientRemoval(resource1, resource2);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ TestClientRemoval(resource1.get(), resource2.get());
memoryCache()->evictResources();
}
{
- ResourcePtr<Resource> resource1 =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
- ResourcePtr<Resource> resource2 =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("foo");
- TestClientRemoval(resource1, resource2);
+ TestClientRemoval(resource1.get(), resource2.get());
memoryCache()->evictResources();
}
{
- ResourcePtr<Resource> resource1 =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource1 =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource1->setCacheIdentifier("foo");
- ResourcePtr<Resource> resource2 =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<Resource> resource2 =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("bar");
- TestClientRemoval(resource1, resource2);
+ TestClientRemoval(resource1.get(), resource2.get());
memoryCache()->evictResources();
}
}
// Verifies that CachedResources are evicted from the decode cache
// according to their DecodeCachePriority.
-static void TestDecodeCacheOrder(const ResourcePtr<Resource>& cachedImageLowPriority, const ResourcePtr<Resource>& cachedImageHighPriority)
+static void TestDecodeCacheOrder(Resource* cachedImageLowPriority, Resource* cachedImageHighPriority)
{
memoryCache()->setDelayBeforeLiveDecodedPrune(0);
memoryCache()->setMaxPruneDeferralDelay(0);
@@ -414,23 +424,23 @@ static void TestDecodeCacheOrder(const ResourcePtr<Resource>& cachedImageLowPrio
ASSERT_EQ(memoryCache()->liveSize(), 0u);
// Add the items. The item added first would normally be evicted first.
- memoryCache()->add(cachedImageHighPriority.get());
+ memoryCache()->add(cachedImageHighPriority);
ASSERT_EQ(memoryCache()->deadSize(), 0u);
ASSERT_EQ(memoryCache()->liveSize(), highPrioritySize);
- memoryCache()->add(cachedImageLowPriority.get());
+ memoryCache()->add(cachedImageLowPriority);
ASSERT_EQ(memoryCache()->deadSize(), 0u);
ASSERT_EQ(memoryCache()->liveSize(), highPrioritySize + lowPrioritySize);
// Insert all items in the decoded items list with the same priority
- memoryCache()->updateDecodedResource(cachedImageHighPriority.get(), UpdateForPropertyChange);
- memoryCache()->updateDecodedResource(cachedImageLowPriority.get(), UpdateForPropertyChange);
+ memoryCache()->updateDecodedResource(cachedImageHighPriority, UpdateForPropertyChange);
+ memoryCache()->updateDecodedResource(cachedImageLowPriority, UpdateForPropertyChange);
ASSERT_EQ(memoryCache()->deadSize(), 0u);
ASSERT_EQ(memoryCache()->liveSize(), totalSize);
// Now we will assign their priority and make sure they are moved to the correct buckets.
- memoryCache()->updateDecodedResource(cachedImageLowPriority.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityLow);
- memoryCache()->updateDecodedResource(cachedImageHighPriority.get(), UpdateForPropertyChange, MemoryCacheLiveResourcePriorityHigh);
+ memoryCache()->updateDecodedResource(cachedImageLowPriority, UpdateForPropertyChange, MemoryCacheLiveResourcePriorityLow);
+ memoryCache()->updateDecodedResource(cachedImageHighPriority, UpdateForPropertyChange, MemoryCacheLiveResourcePriorityHigh);
// Should first prune the LowPriority item.
memoryCache()->setCapacities(memoryCache()->minDeadCapacity(), memoryCache()->liveSize() - 10, memoryCache()->liveSize() - 10);
@@ -447,57 +457,57 @@ static void TestDecodeCacheOrder(const ResourcePtr<Resource>& cachedImageLowPrio
TEST_F(MemoryCacheTest, DecodeCacheOrder_Basic)
{
- ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
- ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
- TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
+ TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
}
TEST_F(MemoryCacheTest, DecodeCacheOrder_MultipleResourceMaps)
{
{
- ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
- ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageLowPriority->setCacheIdentifier("foo");
- TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+ TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
memoryCache()->evictResources();
}
{
- ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
- new FakeDecodedResource(ResourceRequest("http://foo.com"), Resource::Raw);
- ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ FakeDecodedResource::create(ResourceRequest("http://foo.com"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageHighPriority->setCacheIdentifier("foo");
- TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+ TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
memoryCache()->evictResources();
}
{
- ResourcePtr<FakeDecodedResource> cachedImageLowPriority =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageLowPriority =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageLowPriority->setCacheIdentifier("foo");
- ResourcePtr<FakeDecodedResource> cachedImageHighPriority =
- new FakeDecodedResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeDecodedResource> cachedImageHighPriority =
+ FakeDecodedResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
cachedImageHighPriority->setCacheIdentifier("bar");
- TestDecodeCacheOrder(cachedImageLowPriority, cachedImageHighPriority);
+ TestDecodeCacheOrder(cachedImageLowPriority.get(), cachedImageHighPriority.get());
memoryCache()->evictResources();
}
}
TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
{
- ResourcePtr<FakeResource> resource1 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->add(resource1.get());
- ResourcePtr<FakeResource> resource2 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<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()));
- ResourcePtr<FakeResource> resource3 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->remove(resource2.get());
memoryCache()->add(resource3.get());
EXPECT_TRUE(memoryCache()->contains(resource3.get()));
@@ -506,10 +516,10 @@ TEST_F(MemoryCacheTest, RemoveDuringRevalidation)
TEST_F(MemoryCacheTest, ResourceMapIsolation)
{
- ResourcePtr<FakeResource> resource1 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> resource1 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
memoryCache()->add(resource1.get());
- ResourcePtr<FakeResource> resource2 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> resource2 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource2->setCacheIdentifier("foo");
memoryCache()->add(resource2.get());
EXPECT_TRUE(memoryCache()->contains(resource1.get()));
@@ -521,7 +531,7 @@ TEST_F(MemoryCacheTest, ResourceMapIsolation)
EXPECT_EQ(resource2.get(), memoryCache()->resourceForURL(url, "foo"));
EXPECT_EQ(0, memoryCache()->resourceForURL(KURL()));
- ResourcePtr<FakeResource> resource3 = new FakeResource(ResourceRequest("http://test/resource"), Resource::Raw);
+ RefPtrWillBeRawPtr<FakeResource> resource3 = FakeResource::create(ResourceRequest("http://test/resource"), Resource::Raw);
resource3->setCacheIdentifier("foo");
memoryCache()->remove(resource2.get());
memoryCache()->add(resource3.get());
« no previous file with comments | « third_party/WebKit/Source/core/fetch/MemoryCache.cpp ('k') | third_party/WebKit/Source/core/fetch/MockImageResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698