diff options
| -rw-r--r-- | base/id_map.h | 4 | ||||
| -rw-r--r-- | base/id_map_unittest.cc | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/base/id_map.h b/base/id_map.h index b108dbd..acfba42 100644 --- a/base/id_map.h +++ b/base/id_map.h @@ -82,7 +82,7 @@ class IDMap { } bool IsEmpty() const { - return data_.empty(); + return size() == 0u; } T* Lookup(KeyType id) const { @@ -93,7 +93,7 @@ class IDMap { } size_t size() const { - return data_.size(); + return data_.size() - removed_ids_.size(); } // It is safe to remove elements from the map during iteration. All iterators diff --git a/base/id_map_unittest.cc b/base/id_map_unittest.cc index 58abf96..54475b6 100644 --- a/base/id_map_unittest.cc +++ b/base/id_map_unittest.cc @@ -67,10 +67,21 @@ TEST_F(IDMapTest, IteratorRemainsValidWhenRemovingCurrentElement) { map.Add(&obj2); map.Add(&obj3); - for (IDMap<TestObject>::const_iterator iter(&map); - !iter.IsAtEnd(); iter.Advance()) { - map.Remove(iter.GetCurrentKey()); + { + IDMap<TestObject>::const_iterator iter(&map); + while (!iter.IsAtEnd()) { + map.Remove(iter.GetCurrentKey()); + iter.Advance(); + } + + // Test that while an iterator is still in scope, we get the map emptiness + // right (http://crbug.com/35571). + EXPECT_TRUE(map.IsEmpty()); + EXPECT_EQ(0U, map.size()); } + + EXPECT_TRUE(map.IsEmpty()); + EXPECT_EQ(0U, map.size()); } TEST_F(IDMapTest, IteratorRemainsValidWhenRemovingOtherElements) { |