Changeset 12321 in webkit for trunk/JavaScriptCore/kxmlcore/HashTable.h

Timestamp:

Jan 23, 2006, 4:56:32 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Rubber stamped by Tim Hatcher.

• renamed inert() operation on HashSet, HashCountedSet and HashTable to add() for consistency with HashMap

• kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction):
• kjs/collector.cpp: (KJS::Collector::protect):
• kjs/identifier.cpp: (KJS::Identifier::add):
• kxmlcore/HashCountedSet.h: (KXMLCore::::add):
• kxmlcore/HashMap.h: (KXMLCore::::inlineAdd):
• kxmlcore/HashSet.h: (KXMLCore::::add):
• kxmlcore/HashTable.h: (KXMLCore::HashTable::add): (KXMLCore::::add): (KXMLCore::::HashTable):

WebCore:

Rubber stamped by Tim Hatcher.

• renamed inert() operation on HashSet, HashCountedSet and HashTable to add() for consistency with HashMap

• bridge/mac/MacFrame.mm: (MacFrame::didTellBridgeAboutLoad):
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNode::mark):
• khtml/html/HTMLElementImpl.cpp: (WebCore::HTMLElementImpl::isRecognizedTagName): (WebCore::inlineTagList): (WebCore::blockTagList):
• khtml/html/HTMLFormCollectionImpl.cpp: (WebCore::HTMLFormCollectionImpl::updateNameCache):
• khtml/html/htmlparser.cpp: (HTMLParser::isHeaderTag): (HTMLParser::isResidualStyleTag): (HTMLParser::isAffectedByResidualStyle):
• khtml/xml/DocumentImpl.cpp: (WebCore::DocumentImpl::addElementById): (WebCore::DocumentImpl::registerDisconnectedNodeWithEventListeners):
• khtml/xml/NodeImpl.cpp: (WebCore::NodeImpl::registerNodeList):
• khtml/xml/dom_atomicstring.cpp: (DOM::AtomicString::add):
• khtml/xml/dom_qname.cpp: (DOM::QualifiedName::QualifiedName):
• loader/CachedObject.cpp: (WebCore::CachedObject::ref):
• page/Frame.cpp: (Frame::keepAlive):
• rendering/render_canvas.cpp: (RenderCanvas::addWidget):
• rendering/render_frames.cpp: (WebCore::RenderPartObject::updateWidget):
• rendering/render_line.cpp: (WebCore::InlineFlowBox::paint):
• xml/xmlhttprequest.cpp: (WebCore::XMLHttpRequest::addToRequestsByDocument):

File:

• trunk/JavaScriptCore/kxmlcore/HashTable.h (modified) (3 diffs)

trunk/JavaScriptCore/kxmlcore/HashTable.h

@@ -285 +285 @@
         int capacity() const { return m_tableSize; }
 
-        pair<iterator, bool> insert(const ValueType& value) { return insert<KeyType, ValueType, IdentityTranslatorType>(ExtractKey(value), value); }
-
-        // A special version of insert() that finds the object by hashing and comparing
+        pair<iterator, bool> add(const ValueType& value) { return add<KeyType, ValueType, IdentityTranslatorType>(ExtractKey(value), value); }
+
+        // A special version of add() 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.
-        template<typename T, typename Extra, typename HashTranslator> pair<iterator, bool> insert(const T& key, const Extra&);
+        template<typename T, typename Extra, typename HashTranslator> pair<iterator, bool> add(const T& key, const Extra&);
 
         iterator find(const KeyType&);
@@ -416 +416 @@
     template<typename Key, typename Value, const Key& ExtractKey(const Value&), typename HashFunctions, typename Traits, typename KeyTraits>
     template<typename T, typename Extra, typename HashTranslator>
-    inline pair<typename HashTable<Key, Value, ExtractKey, HashFunctions, Traits, KeyTraits>::iterator, bool> HashTable<Key, Value, ExtractKey, HashFunctions, Traits, KeyTraits>::insert(const T& key, const Extra &extra)
+    inline pair<typename HashTable<Key, Value, ExtractKey, HashFunctions, Traits, KeyTraits>::iterator, bool> HashTable<Key, Value, ExtractKey, HashFunctions, Traits, KeyTraits>::add(const T& key, const Extra &extra)
     {
         invalidateIterators();
@@ -632 +632 @@
 #endif
     {
-        // Copy the hash table the dumb way, by inserting each element into the new table.
+        // Copy the hash table the dumb way, by adding each element to the new table.
         // It might be more efficient to copy the table slots, but it's not clear that efficiency is needed.
         const_iterator end = other.end();
         for (const_iterator it = other.begin(); it != end; ++it)
-            insert(*it);
+            add(*it);
     }