Migrate WTF::HashMap::add() to ::insert() [final]

third_party/WebKit/Source/wtf/HashMap.h

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2011 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 129 matching lines @@
 
   // replaces value but not key if key is already present return value is a
   // pair of the iterator to the key location, and a boolean that's true if a
   // new value was actually added
   template <typename IncomingKeyType, typename IncomingMappedType>
   AddResult set(IncomingKeyType&&, IncomingMappedType&&);
 
   // does nothing if key is already present return value is a pair of the
   // iterator to the key location, and a boolean that's true if a new value
   // was actually added
-  // TODO(pilgrim) remove deprecated add() method, use insert() instead
-  // https://crbug.com/662431
-  template <typename IncomingKeyType, typename IncomingMappedType>
-  AddResult add(IncomingKeyType&&, IncomingMappedType&&);
   template <typename IncomingKeyType, typename IncomingMappedType>
   AddResult insert(IncomingKeyType&&, IncomingMappedType&&);
 
   // TODO(pilgrim) remove remove() method once all references migrated to
   // erase()
   // https://crbug.com/662431
   void remove(KeyPeekInType);
   void erase(KeyPeekInType);
   void remove(iterator);
   void clear();
   template <typename Collection>
   void removeAll(const Collection& toBeRemoved) {
     WTF::removeAll(*this, toBeRemoved);
   }
 
   MappedType take(KeyPeekInType);  // efficient combination of get with remove
 
   // An alternate version of find() that finds the object by hashing and
   // comparing with some other type, to avoid the cost of type
   // conversion. HashTranslator must have the following function members:
   //   static unsigned hash(const T&);
   //   static bool equal(const ValueType&, const T&);
   template <typename HashTranslator, typename T>
   iterator find(const T&);
   template <typename HashTranslator, typename T>
   const_iterator find(const T&) const;
   template <typename HashTranslator, typename T>
   bool contains(const T&) const;
 
-  // An alternate version of add() that finds the object by hashing and
+  // An alternate version of insert() that finds the object by hashing and
   // comparing with some other type, to avoid the cost of type conversion if
   // the object is already in the table. HashTranslator must have the
   // following function members:
   //   static unsigned hash(const T&);
   //   static bool equal(const ValueType&, const T&);
   //   static translate(ValueType&, const T&, unsigned hashCode);
-  // TODO(pilgrim) remove deprecated add() method, use insert() instead
-  // https://crbug.com/662431
   template <typename HashTranslator,
             typename IncomingKeyType,
             typename IncomingMappedType>
-  AddResult add(IncomingKeyType&&, IncomingMappedType&&);
-  template <typename HashTranslator,
-            typename IncomingKeyType,
-            typename IncomingMappedType>
   AddResult insert(IncomingKeyType&&, IncomingMappedType&&);
 
   static bool isValidKey(KeyPeekInType);
 
   template <typename VisitorDispatcher>
   void trace(VisitorDispatcher visitor) {
     m_impl.trace(visitor);
   }
 
  private:
@@ skipping 359 matching lines @@
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
 template <typename HashTranslator,
           typename IncomingKeyType,
           typename IncomingMappedType>
-auto HashMap<T, U, V, W, X, Y>::add(IncomingKeyType&& key,
-                                    IncomingMappedType&& mapped) -> AddResult {
-  return m_impl.template addPassingHashCode<
-      HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(
-      std::forward<IncomingKeyType>(key),
-      std::forward<IncomingMappedType>(mapped));
-}
-
-template <typename T,
-          typename U,
-          typename V,
-          typename W,
-          typename X,
-          typename Y>
-template <typename HashTranslator,
-          typename IncomingKeyType,
-          typename IncomingMappedType>
 auto HashMap<T, U, V, W, X, Y>::insert(IncomingKeyType&& key,
                                        IncomingMappedType&& mapped)
     -> AddResult {
   return m_impl.template addPassingHashCode<
       HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(
       std::forward<IncomingKeyType>(key),
       std::forward<IncomingMappedType>(mapped));
 }
 
 template <typename T,
           typename U,
           typename V,
           typename W,
           typename X,
           typename Y>
 template <typename IncomingKeyType, typename IncomingMappedType>
-typename HashMap<T, U, V, W, X, Y>::AddResult HashMap<T, U, V, W, X, Y>::add(
-    IncomingKeyType&& key,
-    IncomingMappedType&& mapped) {
-  return inlineAdd(std::forward<IncomingKeyType>(key),
-                   std::forward<IncomingMappedType>(mapped));
-}
-
-template <typename T,
-          typename U,
-          typename V,
-          typename W,
-          typename X,
-          typename Y>
-template <typename IncomingKeyType, typename IncomingMappedType>
 typename HashMap<T, U, V, W, X, Y>::AddResult HashMap<T, U, V, W, X, Y>::insert(
     IncomingKeyType&& key,
     IncomingMappedType&& mapped) {
   return inlineAdd(std::forward<IncomingKeyType>(key),
                    std::forward<IncomingMappedType>(mapped));
 }
 
 template <typename T,
           typename U,
           typename V,
@@ skipping 157 matching lines @@
   iterator end = collection.end().values();
   for (unsigned i = 0; it != end; ++it, ++i)
     vector[i] = *it;
 }
 
 }  // namespace WTF
 
 using WTF::HashMap;
 
 #endif  // WTF_HashMap_h