Changeset 102669 in webkit

Timestamp:

Dec 13, 2011 4:03:37 AM (12 years ago)

Author:

kling@webkit.org

Message:

CollectionCache: Remove unused copy constructor and make it noncopyable.
<​http://webkit.org/b/74378>

Reviewed by Simon Hausmann.

• html/CollectionCache.cpp:
• html/CollectionCache.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/CollectionCache.cpp (modified) (1 diff)
• html/CollectionCache.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Andreas Kling  <kling@webkit.org>
+
+        CollectionCache: Remove unused copy constructor and make it noncopyable.
+        <http://webkit.org/b/74378>
+
+        Reviewed by Simon Hausmann.
+
+        * html/CollectionCache.cpp:
+        * html/CollectionCache.h:
+
 2011-12-13  Jarred Nicholls  <jarred@sencha.com>
 

trunk/Source/WebCore/html/CollectionCache.cpp

@@ -33 +33 @@
 }
 
-inline void CollectionCache::copyCacheMap(NodeCacheMap& dest, const NodeCacheMap& src)
-{
-    ASSERT(dest.isEmpty());
-    NodeCacheMap::const_iterator end = src.end();
-    for (NodeCacheMap::const_iterator it = src.begin(); it != end; ++it)
-        dest.add(it->first, adoptPtr(new Vector<Element*>(*it->second)));
-}
-
-CollectionCache::CollectionCache(const CollectionCache& other)
-    : version(other.version)
-    , current(other.current)
-    , position(other.position)
-    , length(other.length)
-    , elementsArrayPosition(other.elementsArrayPosition)
-    , hasLength(other.hasLength)
-    , hasNameCache(other.hasNameCache)
-{
-    copyCacheMap(idCache, other.idCache);
-    copyCacheMap(nameCache, other.nameCache);
-}
-
-void CollectionCache::swap(CollectionCache& other)
-{
-    std::swap(version, other.version);
-    std::swap(current, other.current);
-    std::swap(position, other.position);
-    std::swap(length, other.length);
-    std::swap(elementsArrayPosition, other.elementsArrayPosition);
-
-    idCache.swap(other.idCache);
-    nameCache.swap(other.nameCache);
-    
-    std::swap(hasLength, other.hasLength);
-    std::swap(hasNameCache, other.hasNameCache);
-}
-
 void CollectionCache::reset()
 {

trunk/Source/WebCore/html/CollectionCache.h

@@ -31 +31 @@
 
 struct CollectionCache {
-    WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_FAST_ALLOCATED; WTF_MAKE_NONCOPYABLE(CollectionCache);
 public:
     CollectionCache();
-    CollectionCache(const CollectionCache&);
-    CollectionCache& operator=(const CollectionCache& other)
-    {
-        CollectionCache tmp(other);    
-        swap(tmp);
-        return *this;
-    }
 
     void reset();
-    void swap(CollectionCache&);
 
     void checkConsistency();
@@ -58 +50 @@
     bool hasLength;
     bool hasNameCache;
-
-private:
-    static void copyCacheMap(NodeCacheMap&, const NodeCacheMap&);
 };