Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/DocumentOrderedMap.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/TreeScope.h"
 #include "core/html/HTMLMapElement.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 
-PassOwnPtrWillBeRawPtr<DocumentOrderedMap> DocumentOrderedMap::create()
+RawPtr<DocumentOrderedMap> DocumentOrderedMap::create()
 {
-    return adoptPtrWillBeNoop(new DocumentOrderedMap);
+    return (new DocumentOrderedMap);
 }
 
 DocumentOrderedMap::DocumentOrderedMap()
 {
 }
 
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(DocumentOrderedMap);
-
 #if ENABLE(ASSERT)
 static int s_removeScopeLevel = 0;
 
 DocumentOrderedMap::RemoveScope::RemoveScope()
 {
     s_removeScopeLevel++;
 }
 
 DocumentOrderedMap::RemoveScope::~RemoveScope()
 {
@@ skipping 20 matching lines @@
 inline bool keyMatchesLabelForAttribute(const AtomicString& key, const Element& element)
 {
     return isHTMLLabelElement(element) && element.getAttribute(forAttr) == key;
 }
 
 void DocumentOrderedMap::add(const AtomicString& key, Element* element)
 {
     ASSERT(key);
     ASSERT(element);
 
-    Map::AddResult addResult = m_map.add(key, adoptPtrWillBeNoop(new MapEntry(element)));
+    Map::AddResult addResult = m_map.add(key, (new MapEntry(element)));
     if (addResult.isNewEntry)
         return;
 
-    OwnPtrWillBeMember<MapEntry>& entry = addResult.storedValue->value;
+    Member<MapEntry>& entry = addResult.storedValue->value;
     ASSERT(entry->count);
     entry->element = nullptr;
     entry->count++;
     entry->orderedList.clear();
 }
 
 void DocumentOrderedMap::remove(const AtomicString& key, Element* element)
 {
     ASSERT(key);
     ASSERT(element);
 
     Map::iterator it = m_map.find(key);
     if (it == m_map.end())
         return;
 
-    OwnPtrWillBeMember<MapEntry>& entry = it->value;
+    Member<MapEntry>& entry = it->value;
     ASSERT(entry->count);
     if (entry->count == 1) {
         ASSERT(!entry->element || entry->element == element);
         m_map.remove(it);
     } else {
         if (entry->element == element) {
             ASSERT(entry->orderedList.isEmpty() || entry->orderedList.first() == element);
             entry->element = entry->orderedList.size() > 1 ? entry->orderedList[1] : nullptr;
         }
         entry->count--;
@@ skipping 29 matching lines @@
     // removals, allow failure iff we're in the scope of node removals.
     ASSERT(s_removeScopeLevel);
     return 0;
 }
 
 Element* DocumentOrderedMap::getElementById(const AtomicString& key, const TreeScope* scope) const
 {
     return get<keyMatchesId>(key, scope);
 }
 
-const WillBeHeapVector<RawPtrWillBeMember<Element>>& DocumentOrderedMap::getAllElementsById(const AtomicString& key, const TreeScope* scope) const
+const HeapVector<Member<Element>>& DocumentOrderedMap::getAllElementsById(const AtomicString& key, const TreeScope* scope) const
 {
     ASSERT(key);
     ASSERT(scope);
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapVector<RawPtrWillBeMember<Element>>>, emptyVector, (adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<Element>>())));
+    DEFINE_STATIC_LOCAL(Persistent<HeapVector<Member<Element>>>, emptyVector, ((new HeapVector<Member<Element>>())));
 
     Map::iterator it = m_map.find(key);
     if (it == m_map.end())
         return *emptyVector;
 
-    OwnPtrWillBeMember<MapEntry>& entry = it->value;
+    Member<MapEntry>& entry = it->value;
     ASSERT(entry->count);
 
     if (entry->orderedList.isEmpty()) {
         entry->orderedList.reserveCapacity(entry->count);
         for (Element* element = entry->element ? entry->element.get() : ElementTraversal::firstWithin(scope->rootNode()); entry->orderedList.size() < entry->count; element = ElementTraversal::next(*element)) {
             ASSERT(element);
             if (!keyMatchesId(key, *element))
                 continue;
             entry->orderedList.uncheckedAppend(element);
         }
@@ skipping 28 matching lines @@
 
 DEFINE_TRACE(DocumentOrderedMap::MapEntry)
 {
     visitor->trace(element);
 #if ENABLE(OILPAN)
     visitor->trace(orderedList);
 #endif
 }
 
 } // namespace blink