Get rid of 'PassInType' in hash traits and containers

third_party/WebKit/Source/wtf/HashTraits.h

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2011, 2012 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 84 matching lines @@
     static T emptyValue() { return T(); }
 
     // Type for functions that do not take ownership, such as contains.
     typedef const T& PeekInType;
     typedef T* IteratorGetType;
     typedef const T* IteratorConstGetType;
     typedef T& IteratorReferenceType;
     typedef const T& IteratorConstReferenceType;
     static IteratorReferenceType getToReferenceConversion(IteratorGetType x) { return *x; }
     static IteratorConstReferenceType getToReferenceConstConversion(IteratorConstGetType x) { return *x; }
-    // Type for functions that take ownership, such as add.
-    // The store function either not be called or called once to store something
-    // passed in.  The value passed to the store function will be PassInType.
-    typedef const T& PassInType;
+
     template <typename IncomingValueType>
     static void store(IncomingValueType&& value, T& storage) { storage = std::forward<IncomingValueType>(value); }
 
     // Type for return value of functions that do not transfer ownership, such
     // as get.
     // FIXME: We could change this type to const T& for better performance if we
     // figured out a way to handle the return value from emptyValue, which is a
     // temporary.
     typedef T PeekOutType;
     static const T& peek(const T& value) { return value; }
@@ skipping 38 matching lines @@
 template <typename P> struct HashTraits<OwnPtr<P>> : SimpleClassHashTraits<OwnPtr<P>> {
     typedef std::nullptr_t EmptyValueType;
 
     static EmptyValueType emptyValue() { return nullptr; }
 
     static const bool hasIsEmptyValueFunction = true;
     static bool isEmptyValue(const OwnPtr<P>& value) { return !value; }
 
     typedef typename OwnPtr<P>::PtrType PeekInType;
 
-    typedef PassOwnPtr<P> PassInType;
     static void store(PassOwnPtr<P> value, OwnPtr<P>& storage) { storage = std::move(value); }
 
     typedef typename OwnPtr<P>::PtrType PeekOutType;
     static PeekOutType peek(const OwnPtr<P>& value) { return value.get(); }
     static PeekOutType peek(std::nullptr_t) { return 0; }
 };
 
 template <typename P> struct HashTraits<RefPtr<P>> : SimpleClassHashTraits<RefPtr<P>> {
     typedef std::nullptr_t EmptyValueType;
     static EmptyValueType emptyValue() { return nullptr; }
 
     static const bool hasIsEmptyValueFunction = true;
     static bool isEmptyValue(const RefPtr<P>& value) { return !value; }
 
     typedef RefPtrValuePeeker<P> PeekInType;
     typedef RefPtr<P>* IteratorGetType;
     typedef const RefPtr<P>* IteratorConstGetType;
     typedef RefPtr<P>& IteratorReferenceType;
     typedef const RefPtr<P>& IteratorConstReferenceType;
     static IteratorReferenceType getToReferenceConversion(IteratorGetType x) { return *x; }
     static IteratorConstReferenceType getToReferenceConstConversion(IteratorConstGetType x) { return *x; }
 
-    typedef PassRefPtr<P> PassInType;
     static void store(PassRefPtr<P> value, RefPtr<P>& storage) { storage = value; }
 
     typedef P* PeekOutType;
     static PeekOutType peek(const RefPtr<P>& value) { return value.get(); }
     static PeekOutType peek(std::nullptr_t) { return 0; }
 };
 
 template <typename T>
 struct HashTraits<std::unique_ptr<T>> : SimpleClassHashTraits<std::unique_ptr<T>> {
     using EmptyValueType = std::nullptr_t;
     static EmptyValueType emptyValue() { return nullptr; }
 
     static const bool hasIsEmptyValueFunction = true;
     static bool isEmptyValue(const std::unique_ptr<T>& value) { return !value; }
 
     using PeekInType = T*;
 
-    using PassInType = std::unique_ptr<T>;
     static void store(std::unique_ptr<T>&& value, std::unique_ptr<T>& storage) { storage = std::move(value); }
 
     using PeekOutType = T*;
     static PeekOutType peek(const std::unique_ptr<T>& value) { return value.get(); }
     static PeekOutType peek(std::nullptr_t) { return nullptr; }
 
     static void constructDeletedValue(std::unique_ptr<T>& slot, bool)
     {
         // Dirty trick: implant an invalid pointer to unique_ptr. Destructor isn't called for deleted buckets,
         // so this is okay.
@@ skipping 129 matching lines @@
 struct TraceInCollectionTrait;
 
 } // namespace WTF
 
 using WTF::HashTraits;
 using WTF::PairHashTraits;
 using WTF::NullableHashTraits;
 using WTF::SimpleClassHashTraits;
 
 #endif // WTF_HashTraits_h