Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 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 28 matching lines @@
 // calculation every time if anything has changed.
 
 HTMLFormControlsCollection::HTMLFormControlsCollection(ContainerNode& ownerNode)
     : HTMLCollection(ownerNode, FormControls, OverridesItemAfter)
     , m_cachedElement(nullptr)
     , m_cachedElementOffsetInArray(0)
 {
     ASSERT(isHTMLFormElement(ownerNode) || isHTMLFieldSetElement(ownerNode));
 }
 
-PassRefPtrWillBeRawPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType type)
+RawPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType type)
 {
     ASSERT_UNUSED(type, type == FormControls);
-    return adoptRefWillBeNoop(new HTMLFormControlsCollection(ownerNode));
+    return (new HTMLFormControlsCollection(ownerNode));
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection()
 {
 }
 
 const FormAssociatedElement::List& HTMLFormControlsCollection::formControlElements() const
 {
     ASSERT(isHTMLFormElement(ownerNode()) || isHTMLFieldSetElement(ownerNode()));
     if (isHTMLFormElement(ownerNode()))
         return toHTMLFormElement(ownerNode()).associatedElements();
     return toHTMLFieldSetElement(ownerNode()).associatedElements();
 }
 
-const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>& HTMLFormControlsCollection::formImageElements() const
+const HeapVector<Member<HTMLImageElement>>& HTMLFormControlsCollection::formImageElements() const
 {
     return toHTMLFormElement(ownerNode()).imageElements();
 }
 
 static unsigned findFormAssociatedElement(const FormAssociatedElement::List& associatedElements, Element* element)
 {
     unsigned i = 0;
     for (; i < associatedElements.size(); ++i) {
         FormAssociatedElement* associatedElement = associatedElements[i];
         if (associatedElement->isEnumeratable() && toHTMLElement(associatedElement) == element)
@@ skipping 25 matching lines @@
 }
 
 void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const
 {
     HTMLCollection::invalidateCache(oldDocument);
     m_cachedElement = nullptr;
     m_cachedElementOffsetInArray = 0;
 }
 
 static HTMLElement* firstNamedItem(const FormAssociatedElement::List& elementsArray,
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>* imageElementsArray, const QualifiedName& attrName, const String& name)
+    const HeapVector<Member<HTMLImageElement>>* imageElementsArray, const QualifiedName& attrName, const String& name)
 {
     ASSERT(attrName == idAttr || attrName == nameAttr);
 
     for (unsigned i = 0; i < elementsArray.size(); ++i) {
         HTMLElement* element = toHTMLElement(elementsArray[i]);
         if (elementsArray[i]->isEnumeratable() && element->fastGetAttribute(attrName) == name)
             return element;
     }
 
     if (!imageElementsArray)
@@ skipping 10 matching lines @@
     return nullptr;
 }
 
 HTMLElement* HTMLFormControlsCollection::namedItem(const AtomicString& name) const
 {
     // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
     // This method first searches for an object with a matching id
     // attribute. If a match is not found, the method then searches for an
     // object with a matching name attribute, but only on those elements
     // that are allowed a name attribute.
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>* imagesElements = isHTMLFieldSetElement(ownerNode()) ? 0 : &formImageElements();
+    const HeapVector<Member<HTMLImageElement>>* imagesElements = isHTMLFieldSetElement(ownerNode()) ? 0 : &formImageElements();
     if (HTMLElement* item = firstNamedItem(formControlElements(), imagesElements, idAttr, name))
         return item;
 
     return firstNamedItem(formControlElements(), imagesElements, nameAttr, name);
 }
 
 void HTMLFormControlsCollection::updateIdNameCache() const
 {
     if (hasValidIdNameCache())
         return;
 
-    OwnPtrWillBeRawPtr<NamedItemCache> cache = NamedItemCache::create();
+    RawPtr<NamedItemCache> cache = NamedItemCache::create();
     HashSet<StringImpl*> foundInputElements;
 
     const FormAssociatedElement::List& elementsArray = formControlElements();
 
     for (unsigned i = 0; i < elementsArray.size(); ++i) {
         FormAssociatedElement* associatedElement = elementsArray[i];
         if (associatedElement->isEnumeratable()) {
             HTMLElement* element = toHTMLElement(associatedElement);
             const AtomicString& idAttrVal = element->getIdAttribute();
             const AtomicString& nameAttrVal = element->getNameAttribute();
             if (!idAttrVal.isEmpty()) {
                 cache->addElementWithId(idAttrVal, element);
                 foundInputElements.add(idAttrVal.impl());
             }
             if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal) {
                 cache->addElementWithName(nameAttrVal, element);
                 foundInputElements.add(nameAttrVal.impl());
             }
         }
     }
 
     if (isHTMLFormElement(ownerNode())) {
-        const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>& imageElementsArray = formImageElements();
+        const HeapVector<Member<HTMLImageElement>>& imageElementsArray = formImageElements();
         for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
             HTMLImageElement* element = imageElementsArray[i];
             const AtomicString& idAttrVal = element->getIdAttribute();
             const AtomicString& nameAttrVal = element->getNameAttribute();
             if (!idAttrVal.isEmpty() && !foundInputElements.contains(idAttrVal.impl()))
                 cache->addElementWithId(idAttrVal, element);
             if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal && !foundInputElements.contains(nameAttrVal.impl()))
                 cache->addElementWithName(nameAttrVal, element);
         }
     }
 
     // Set the named item cache last as traversing the tree may cause cache invalidation.
     setNamedItemCache(cache.release());
 }
 
 void HTMLFormControlsCollection::namedGetter(const AtomicString& name, RadioNodeListOrElement& returnValue)
 {
-    WillBeHeapVector<RefPtrWillBeMember<Element>> namedItems;
+    HeapVector<Member<Element>> namedItems;
     this->namedItems(name, namedItems);
 
     if (namedItems.isEmpty())
         return;
 
     if (namedItems.size() == 1) {
         if (isHTMLImageElement(*namedItems[0]))
             UseCounter::count(document(), UseCounter::FormControlsCollectionNameAccessForImageElement);
         returnValue.setElement(namedItems.at(0));
         return;
@@ skipping 31 matching lines @@
     }
 }
 
 DEFINE_TRACE(HTMLFormControlsCollection)
 {
     visitor->trace(m_cachedElement);
     HTMLCollection::trace(visitor);
 }
 
 } // namespace blink