Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/html/HTMLCollection.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 14 matching lines @@
 #define HTMLCollection_h
 
 #include "core/CoreExport.h"
 #include "core/dom/LiveNodeListBase.h"
 #include "core/html/CollectionItemsCache.h"
 #include "core/html/CollectionType.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
-class CORE_EXPORT HTMLCollection : public RefCountedWillBeGarbageCollectedFinalized<HTMLCollection>, public ScriptWrappable, public LiveNodeListBase {
+class CORE_EXPORT HTMLCollection : public GarbageCollectedFinalized<HTMLCollection>, public ScriptWrappable, public LiveNodeListBase {
     DEFINE_WRAPPERTYPEINFO();
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLCollection);
+    USING_GARBAGE_COLLECTED_MIXIN(HTMLCollection);
 public:
     enum ItemAfterOverrideType {
         OverridesItemAfter,
         DoesNotOverrideItemAfter,
     };
 
-    static PassRefPtrWillBeRawPtr<HTMLCollection> create(ContainerNode& base, CollectionType);
+    static RawPtr<HTMLCollection> create(ContainerNode& base, CollectionType);
     virtual ~HTMLCollection();
     void invalidateCache(Document* oldDocument = 0) const override;
     void invalidateCacheForAttribute(const QualifiedName*) const;
 
     // DOM API
     unsigned length() const;
     Element* item(unsigned offset) const;
     virtual Element* namedItem(const AtomicString& name) const;
     bool namedPropertyQuery(const AtomicString&, ExceptionState&);
     void namedPropertyEnumerator(Vector<String>& names, ExceptionState&);
 
     // Non-DOM API
-    void namedItems(const AtomicString& name, WillBeHeapVector<RefPtrWillBeMember<Element>>&) const;
+    void namedItems(const AtomicString& name, HeapVector<Member<Element>>&) const;
     bool isEmpty() const { return m_collectionItemsCache.isEmpty(*this); }
     bool hasExactlyOneItem() const { return m_collectionItemsCache.hasExactlyOneNode(*this); }
     bool elementMatches(const Element&) const;
 
     // CollectionIndexCache API.
     bool canTraverseBackward() const { return !overridesItemAfter(); }
     Element* traverseToFirst() const;
     Element* traverseToLast() const;
     Element* traverseForwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset) const;
     Element* traverseBackwardToOffset(unsigned offset, Element& currentElement, unsigned& currentOffset) const;
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     HTMLCollection(ContainerNode& base, CollectionType, ItemAfterOverrideType);
 
-    class NamedItemCache final : public NoBaseWillBeGarbageCollected<NamedItemCache> {
+    class NamedItemCache final : public GarbageCollected<NamedItemCache> {
     public:
-        static PassOwnPtrWillBeRawPtr<NamedItemCache> create()
+        static RawPtr<NamedItemCache> create()
         {
             return adoptPtrWillBeNoop(new NamedItemCache);
         }
 
-        WillBeHeapVector<RawPtrWillBeMember<Element>>* getElementsById(const AtomicString& id) const { return m_idCache.get(id.impl()); }
-        WillBeHeapVector<RawPtrWillBeMember<Element>>* getElementsByName(const AtomicString& name) const { return m_nameCache.get(name.impl()); }
+        HeapVector<Member<Element>>* getElementsById(const AtomicString& id) const { return m_idCache.get(id.impl()); }
+        HeapVector<Member<Element>>* getElementsByName(const AtomicString& name) const { return m_nameCache.get(name.impl()); }
         void addElementWithId(const AtomicString& id, Element* element) { addElementToMap(m_idCache, id, element); }
         void addElementWithName(const AtomicString& name, Element* element) { addElementToMap(m_nameCache, name, element); }
 
         DEFINE_INLINE_TRACE()
         {
 #if ENABLE(OILPAN)
             visitor->trace(m_idCache);
             visitor->trace(m_nameCache);
 #endif
         }
 
     private:
         NamedItemCache();
-        typedef WillBeHeapHashMap<StringImpl*, OwnPtrWillBeMember<WillBeHeapVector<RawPtrWillBeMember<Element>>>> StringToElementsMap;
+        typedef HeapHashMap<StringImpl*, Member<HeapVector<Member<Element>>>> StringToElementsMap;
         static void addElementToMap(StringToElementsMap& map, const AtomicString& key, Element* element)
         {
-            OwnPtrWillBeMember<WillBeHeapVector<RawPtrWillBeMember<Element>>>& vector = map.add(key.impl(), nullptr).storedValue->value;
+            Member<HeapVector<Member<Element>>>& vector = map.add(key.impl(), nullptr).storedValue->value;
             if (!vector)
-                vector = adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<Element>>);
+                vector = adoptPtrWillBeNoop(new HeapVector<Member<Element>>);
             vector->append(element);
         }
 
         StringToElementsMap m_idCache;
         StringToElementsMap m_nameCache;
     };
 
     bool overridesItemAfter() const { return m_overridesItemAfter; }
     virtual Element* virtualItemAfter(Element*) const;
     bool shouldOnlyIncludeDirectChildren() const { return m_shouldOnlyIncludeDirectChildren; }
     virtual void supportedPropertyNames(Vector<String>& names);
 
     virtual void updateIdNameCache() const;
     bool hasValidIdNameCache() const { return m_namedItemCache; }
 
-    void setNamedItemCache(PassOwnPtrWillBeRawPtr<NamedItemCache> cache) const
+    void setNamedItemCache(RawPtr<NamedItemCache> cache) const
     {
         ASSERT(!m_namedItemCache);
         // Do not repeat registration for the same invalidation type.
         if (invalidationType() != InvalidateOnIdNameAttrChange)
             document().registerNodeListWithIdNameCache(this);
         m_namedItemCache = std::move(cache);
     }
 
     NamedItemCache& namedItemCache() const
     {
@@ skipping 18 matching lines @@
     void unregisterIdNameCacheFromDocument(Document& document) const
     {
         ASSERT(hasValidIdNameCache());
         // Do not repeat unregistration for the same invalidation type.
         if (invalidationType() != InvalidateOnIdNameAttrChange)
             document.unregisterNodeListWithIdNameCache(this);
     }
 
     const unsigned m_overridesItemAfter : 1;
     const unsigned m_shouldOnlyIncludeDirectChildren : 1;
-    mutable OwnPtrWillBeMember<NamedItemCache> m_namedItemCache;
+    mutable Member<NamedItemCache> m_namedItemCache;
     mutable CollectionItemsCache<HTMLCollection, Element> m_collectionItemsCache;
 };
 
 DEFINE_TYPE_CASTS(HTMLCollection, LiveNodeListBase, collection, isHTMLCollectionType(collection->type()), isHTMLCollectionType(collection.type()));
 
 inline void HTMLCollection::invalidateCacheForAttribute(const QualifiedName* attrName) const
 {
     if (!attrName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
         invalidateCache();
     else if (*attrName == HTMLNames::idAttr || *attrName == HTMLNames::nameAttr)
         invalidateIdNameCacheMaps();
 }
 
 } // namespace blink
 
 #endif // HTMLCollection_h