base: Make ScopedVector::clear() destroy elements.

base/memory/scoped_vector.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MEMORY_SCOPED_VECTOR_H_
 #define BASE_MEMORY_SCOPED_VECTOR_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 55 matching lines @@
 
   std::vector<T*>& get() { return v; }
   const std::vector<T*>& get() const { return v; }
   void swap(std::vector<T*>& other) { v.swap(other); }
   void swap(ScopedVector<T>& other) { v.swap(other.v); }
   void release(std::vector<T*>* out) {
     out->swap(v);
     v.clear();
   }
 
-  void reset() { STLDeleteElements(&v); }
+  void reset() { clear(); }
   void reserve(size_t capacity) { v.reserve(capacity); }
   void resize(size_t new_size) { v.resize(new_size); }
 
   template<typename InputIterator>
   void assign(InputIterator begin, InputIterator end) {
     v.assign(begin, end);
   }
 
-  void clear() { v.clear(); }
+  void clear() { STLDeleteElements(&v); }

[sky, 2012/07/18 21:24:38]

Any chance we could get rid of one of reset or clear?

[Peter Kasting, 2012/07/18 21:26:32]

(I suggest nuking reset())

+
+  // Like |clear()|, but doesn't delete any elements.
+  void weak_clear() { v.clear(); }
 
   // Lets the ScopedVector take ownership of |x|.
   iterator insert(iterator position, T* x) {
     return v.insert(position, x);
   }
 
   // Lets the ScopedVector take ownership of elements in [first,last).
   template<typename InputIterator>
   void insert(iterator position, InputIterator first, InputIterator last) {
     v.insert(position, first, last);
@@ skipping 17 matching lines @@
   // Like |erase()|, but doesn't delete the elements in [first, last).
   iterator weak_erase(iterator first, iterator last) {
     return v.erase(first, last);
   }
 
  private:
   std::vector<T*> v;
 };
 
 #endif  // BASE_MEMORY_SCOPED_VECTOR_H_