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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/heap/HeapTest.cpp

Issue 2007283002: Allow CrossThreadPersistent in collections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/platform/heap/HeapAllocator.h ('k') | third_party/WebKit/Source/platform/heap/Persistent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/heap/HeapTest.cpp
diff --git a/third_party/WebKit/Source/platform/heap/HeapTest.cpp b/third_party/WebKit/Source/platform/heap/HeapTest.cpp
index b85821351ad4395d839078e29b4ba6f28e86be1d..7738623afd7e153052fc57af8f7d5803bc53044a 100644
--- a/third_party/WebKit/Source/platform/heap/HeapTest.cpp
+++ b/third_party/WebKit/Source/platform/heap/HeapTest.cpp
@@ -2897,6 +2897,244 @@ TEST(HeapTest, HeapCollectionTypes)
EXPECT_EQ(1u, dequeUW2->size());
}
+TEST(HeapTest, PersistentVector)
+{
+ IntWrapper::s_destructorCalls = 0;
+
+ typedef Vector<Persistent<IntWrapper>> PersistentVector;
+
+ Persistent<IntWrapper> one(IntWrapper::create(1));
+ Persistent<IntWrapper> two(IntWrapper::create(2));
+ Persistent<IntWrapper> three(IntWrapper::create(3));
+ Persistent<IntWrapper> four(IntWrapper::create(4));
+ Persistent<IntWrapper> five(IntWrapper::create(5));
+ Persistent<IntWrapper> six(IntWrapper::create(6));
+ {
+ PersistentVector vector;
+ vector.append(one);
+ vector.append(two);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_TRUE(vector.contains(two));
+
+ vector.append(three);
+ vector.append(four);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_TRUE(vector.contains(two));
+ EXPECT_TRUE(vector.contains(three));
+ EXPECT_TRUE(vector.contains(four));
+
+ vector.shrink(1);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_FALSE(vector.contains(two));
+ EXPECT_FALSE(vector.contains(three));
+ EXPECT_FALSE(vector.contains(four));
+ }
+ {
+ PersistentVector vector1;
+ PersistentVector vector2;
+
+ vector1.append(one);
+ vector2.append(two);
+ vector1.swap(vector2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector1.contains(two));
+ EXPECT_TRUE(vector2.contains(one));
+ }
+ {
+ PersistentVector vector1;
+ PersistentVector vector2;
+
+ vector1.append(one);
+ vector1.append(two);
+ vector2.append(three);
+ vector2.append(four);
+ vector2.append(five);
+ vector2.append(six);
+ vector1.swap(vector2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector1.contains(three));
+ EXPECT_TRUE(vector1.contains(four));
+ EXPECT_TRUE(vector1.contains(five));
+ EXPECT_TRUE(vector1.contains(six));
+ EXPECT_TRUE(vector2.contains(one));
+ EXPECT_TRUE(vector2.contains(two));
+ }
+}
+
+TEST(HeapTest, CrossThreadPersistentVector)
+{
+ IntWrapper::s_destructorCalls = 0;
+
+ typedef Vector<CrossThreadPersistent<IntWrapper>> CrossThreadPersistentVector;
+
+ CrossThreadPersistent<IntWrapper> one(IntWrapper::create(1));
+ CrossThreadPersistent<IntWrapper> two(IntWrapper::create(2));
+ CrossThreadPersistent<IntWrapper> three(IntWrapper::create(3));
+ CrossThreadPersistent<IntWrapper> four(IntWrapper::create(4));
+ CrossThreadPersistent<IntWrapper> five(IntWrapper::create(5));
+ CrossThreadPersistent<IntWrapper> six(IntWrapper::create(6));
+ {
+ CrossThreadPersistentVector vector;
+ vector.append(one);
+ vector.append(two);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_TRUE(vector.contains(two));
+
+ vector.append(three);
+ vector.append(four);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_TRUE(vector.contains(two));
+ EXPECT_TRUE(vector.contains(three));
+ EXPECT_TRUE(vector.contains(four));
+
+ vector.shrink(1);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector.contains(one));
+ EXPECT_FALSE(vector.contains(two));
+ EXPECT_FALSE(vector.contains(three));
+ EXPECT_FALSE(vector.contains(four));
+ }
+ {
+ CrossThreadPersistentVector vector1;
+ CrossThreadPersistentVector vector2;
+
+ vector1.append(one);
+ vector2.append(two);
+ vector1.swap(vector2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector1.contains(two));
+ EXPECT_TRUE(vector2.contains(one));
+ }
+ {
+ CrossThreadPersistentVector vector1;
+ CrossThreadPersistentVector vector2;
+
+ vector1.append(one);
+ vector1.append(two);
+ vector2.append(three);
+ vector2.append(four);
+ vector2.append(five);
+ vector2.append(six);
+ vector1.swap(vector2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(vector1.contains(three));
+ EXPECT_TRUE(vector1.contains(four));
+ EXPECT_TRUE(vector1.contains(five));
+ EXPECT_TRUE(vector1.contains(six));
+ EXPECT_TRUE(vector2.contains(one));
+ EXPECT_TRUE(vector2.contains(two));
+ }
+}
+
+TEST(HeapTest, PersistentSet)
+{
+ IntWrapper::s_destructorCalls = 0;
+
+ typedef HashSet<Persistent<IntWrapper>> PersistentSet;
+
+ IntWrapper* oneRaw = IntWrapper::create(1);
+ Persistent<IntWrapper> one(oneRaw);
+ Persistent<IntWrapper> one2(oneRaw);
+ Persistent<IntWrapper> two(IntWrapper::create(2));
+ Persistent<IntWrapper> three(IntWrapper::create(3));
+ Persistent<IntWrapper> four(IntWrapper::create(4));
+ Persistent<IntWrapper> five(IntWrapper::create(5));
+ Persistent<IntWrapper> six(IntWrapper::create(6));
+ {
+ PersistentSet set;
+ set.add(one);
+ set.add(two);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set.contains(one));
+ EXPECT_TRUE(set.contains(one2));
+ EXPECT_TRUE(set.contains(two));
+
+ set.add(three);
+ set.add(four);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set.contains(one));
+ EXPECT_TRUE(set.contains(two));
+ EXPECT_TRUE(set.contains(three));
+ EXPECT_TRUE(set.contains(four));
+
+ set.clear();
+ conservativelyCollectGarbage();
+ EXPECT_FALSE(set.contains(one));
+ EXPECT_FALSE(set.contains(two));
+ EXPECT_FALSE(set.contains(three));
+ EXPECT_FALSE(set.contains(four));
+ }
+ {
+ PersistentSet set1;
+ PersistentSet set2;
+
+ set1.add(one);
+ set2.add(two);
+ set1.swap(set2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set1.contains(two));
+ EXPECT_TRUE(set2.contains(one));
+ EXPECT_TRUE(set2.contains(one2));
+ }
+}
+
+TEST(HeapTest, CrossThreadPersistentSet)
+{
+ IntWrapper::s_destructorCalls = 0;
+
+ typedef HashSet<CrossThreadPersistent<IntWrapper>> CrossThreadPersistentSet;
+
+ IntWrapper* oneRaw = IntWrapper::create(1);
+ CrossThreadPersistent<IntWrapper> one(oneRaw);
+ CrossThreadPersistent<IntWrapper> one2(oneRaw);
+ CrossThreadPersistent<IntWrapper> two(IntWrapper::create(2));
+ CrossThreadPersistent<IntWrapper> three(IntWrapper::create(3));
+ CrossThreadPersistent<IntWrapper> four(IntWrapper::create(4));
+ CrossThreadPersistent<IntWrapper> five(IntWrapper::create(5));
+ CrossThreadPersistent<IntWrapper> six(IntWrapper::create(6));
+ {
+ CrossThreadPersistentSet set;
+ set.add(one);
+ set.add(two);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set.contains(one));
+ EXPECT_TRUE(set.contains(one2));
+ EXPECT_TRUE(set.contains(two));
+
+ set.add(three);
+ set.add(four);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set.contains(one));
+ EXPECT_TRUE(set.contains(two));
+ EXPECT_TRUE(set.contains(three));
+ EXPECT_TRUE(set.contains(four));
+
+ set.clear();
+ conservativelyCollectGarbage();
+ EXPECT_FALSE(set.contains(one));
+ EXPECT_FALSE(set.contains(two));
+ EXPECT_FALSE(set.contains(three));
+ EXPECT_FALSE(set.contains(four));
+ }
+ {
+ CrossThreadPersistentSet set1;
+ CrossThreadPersistentSet set2;
+
+ set1.add(one);
+ set2.add(two);
+ set1.swap(set2);
+ conservativelyCollectGarbage();
+ EXPECT_TRUE(set1.contains(two));
+ EXPECT_TRUE(set2.contains(one));
+ EXPECT_TRUE(set2.contains(one2));
+ }
+}
+
class NonTrivialObject final {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public:
« no previous file with comments | « third_party/WebKit/Source/platform/heap/HeapAllocator.h ('k') | third_party/WebKit/Source/platform/heap/Persistent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698