Changeset 21468 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

May 14, 2007, 5:20:16 PM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Oliver Hunt.

Added HashMap::swap and HashSet::swap. WebCore now uses HashSet::swap.
I figured while I was in the neighborhood I might as well add HashMap::swap,
too.

• wtf/HashMap.h: (WTF::::operator): (WTF::::swap):
• wtf/HashSet.h: (WTF::::operator): (WTF::::swap):

WebCore:

Reviewed by Oliver Hunt.

Some improvements on my last patch, suggested by Darin.

• history/PageCache.cpp: (WebCore::PageCache::autoreleaseNow): Swap with an empty set instead of building up an array and then calling clear(). This is slightly more efficient and the code is cleaner.

Location:

trunk/JavaScriptCore/wtf

Files:

• HashMap.h (modified) (2 diffs)
• HashSet.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/HashMap.h

@@ -68 +68 @@
         HashMap& operator=(const HashMap&);
         ~HashMap();
+
+        void swap(HashMap&);
 
         int size() const;
@@ -177 +179 @@
     {
         HashMap tmp(other);
-        m_impl.swap(tmp.m_impl); 
+        swap(tmp); 
         return *this;
+    }
+
+    template<typename T, typename U, typename V, typename W, typename X>
+    inline void HashMap<T, U, V, W, X>::swap(HashMap& other)
+    {
+        m_impl.swap(other.m_impl); 
     }
 

trunk/JavaScriptCore/wtf/HashSet.h

@@ -58 +58 @@
         HashSet& operator=(const HashSet&);
         ~HashSet();
+
+        void swap(HashSet&);
 
         int size() const;
@@ -183 +185 @@
     {
         HashSet tmp(other);
-        m_impl.swap(tmp.m_impl); 
+        swap(other); 
         return *this;
+    }
+
+    template<typename T, typename U, typename V>
+    inline void HashSet<T, U, V>::swap(HashSet& other)
+    {
+        m_impl.swap(other.m_impl); 
     }