| Index: third_party/WebKit/Source/core/dom/DocumentOrderedMap.h
|
| diff --git a/third_party/WebKit/Source/core/dom/DocumentOrderedMap.h b/third_party/WebKit/Source/core/dom/DocumentOrderedMap.h
|
| index 5b25d3f0461a6548045de89045e0ab42d7a40aeb..4e51f16b7fedc501be05b277dfb0626474c05af7 100644
|
| --- a/third_party/WebKit/Source/core/dom/DocumentOrderedMap.h
|
| +++ b/third_party/WebKit/Source/core/dom/DocumentOrderedMap.h
|
| @@ -44,11 +44,9 @@ namespace blink {
|
| class Element;
|
| class TreeScope;
|
|
|
| -class DocumentOrderedMap : public NoBaseWillBeGarbageCollected<DocumentOrderedMap> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(DocumentOrderedMap);
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentOrderedMap);
|
| +class DocumentOrderedMap : public GarbageCollected<DocumentOrderedMap> {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<DocumentOrderedMap> create();
|
| + static RawPtr<DocumentOrderedMap> create();
|
|
|
| void add(const AtomicString&, Element*);
|
| void remove(const AtomicString&, Element*);
|
| @@ -57,7 +55,7 @@ public:
|
| bool containsMultiple(const AtomicString&) const;
|
| // concrete instantiations of the get<>() method template
|
| Element* getElementById(const AtomicString&, const TreeScope*) const;
|
| - const WillBeHeapVector<RawPtrWillBeMember<Element>>& getAllElementsById(const AtomicString&, const TreeScope*) const;
|
| + const HeapVector<Member<Element>>& getAllElementsById(const AtomicString&, const TreeScope*) const;
|
| Element* getElementByMapName(const AtomicString&, const TreeScope*) const;
|
| Element* getElementByLowercasedMapName(const AtomicString&, const TreeScope*) const;
|
| Element* getElementByLabelForAttribute(const AtomicString&, const TreeScope*) const;
|
| @@ -91,7 +89,7 @@ private:
|
| template<bool keyMatches(const AtomicString&, const Element&)>
|
| Element* get(const AtomicString&, const TreeScope*) const;
|
|
|
| - class MapEntry : public NoBaseWillBeGarbageCollected<MapEntry> {
|
| + class MapEntry : public GarbageCollected<MapEntry> {
|
| public:
|
| explicit MapEntry(Element* firstElement)
|
| : element(firstElement)
|
| @@ -101,12 +99,12 @@ private:
|
|
|
| DECLARE_TRACE();
|
|
|
| - RawPtrWillBeMember<Element> element;
|
| + Member<Element> element;
|
| unsigned count;
|
| - WillBeHeapVector<RawPtrWillBeMember<Element>> orderedList;
|
| + HeapVector<Member<Element>> orderedList;
|
| };
|
|
|
| - using Map = WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<MapEntry>>;
|
| + using Map = HeapHashMap<AtomicString, Member<MapEntry>>;
|
|
|
| mutable Map m_map;
|
| };
|
|
|