Index: third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp |
diff --git a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp |
index 24b70d7d0a4e8ca7b749ef8f6e578ecb2461fce9..f9750d938fd5ac56c5c8f26f1c39b7bdda6109cb 100644 |
--- a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp |
+++ b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp |
@@ -141,31 +141,31 @@ void InvalidationSet::combine(const InvalidationSet& other) |
} |
} |
-WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureClassSet() |
+HashSet<AtomicString>& InvalidationSet::ensureClassSet() |
{ |
if (!m_classes) |
- m_classes = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>); |
+ m_classes = adoptPtr(new HashSet<AtomicString>); |
return *m_classes; |
} |
-WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureIdSet() |
+HashSet<AtomicString>& InvalidationSet::ensureIdSet() |
{ |
if (!m_ids) |
- m_ids = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>); |
+ m_ids = adoptPtr(new HashSet<AtomicString>); |
return *m_ids; |
} |
-WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureTagNameSet() |
+HashSet<AtomicString>& InvalidationSet::ensureTagNameSet() |
{ |
if (!m_tagNames) |
- m_tagNames = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>); |
+ m_tagNames = adoptPtr(new HashSet<AtomicString>); |
return *m_tagNames; |
} |
-WillBeHeapHashSet<AtomicString>& InvalidationSet::ensureAttributeSet() |
+HashSet<AtomicString>& InvalidationSet::ensureAttributeSet() |
{ |
if (!m_attributes) |
- m_attributes = adoptPtrWillBeNoop(new WillBeHeapHashSet<AtomicString>); |
+ m_attributes = adoptPtr(new HashSet<AtomicString>); |
return *m_attributes; |
} |
@@ -212,16 +212,6 @@ void InvalidationSet::setWholeSubtreeInvalid() |
m_attributes = nullptr; |
} |
-DEFINE_TRACE(InvalidationSet) |
-{ |
-#if ENABLE(OILPAN) |
- visitor->trace(m_classes); |
- visitor->trace(m_ids); |
- visitor->trace(m_tagNames); |
- visitor->trace(m_attributes); |
-#endif |
-} |
- |
void InvalidationSet::toTracedValue(TracedValue* value) const |
{ |
value->beginDictionary(); |