Changeset 12321 in webkit for trunk/JavaScriptCore/kxmlcore/HashSet.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/HashSet.h (modified) (3 diffs)

trunk/JavaScriptCore/kxmlcore/HashSet.h

@@ -80 +80 @@
         bool contains(const ValueType& value) const;
         
-        std::pair<iterator, bool> insert(const ValueType &value);
-        
-        // a special version of insert() that finds the object by hashing and comparing
+        // the return value is a pair of an interator to the new value's location, 
+        // and a bool that is true if an new entry was added
+        std::pair<iterator, bool> add(const ValueType &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. HashTranslator should have the following methods:
@@ -89 +91 @@
         //   static translate(ValueType&, const T&, unsigned hashCode);
         template<typename T, typename HashTranslator> 
-        std::pair<iterator, bool> insert(const T& value);
+        std::pair<iterator, bool> add(const T& value);
         
         void remove(const ValueType& value);
@@ -160 +162 @@
     
     template<typename Value, typename HashFunctions, typename Traits>
-    std::pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool> HashSet<Value, HashFunctions, Traits>::insert(const ValueType &value)
-    {
-        return m_impl.insert(value); 
+    std::pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool> HashSet<Value, HashFunctions, Traits>::add(const ValueType &value)
+    {
+        return m_impl.add(value); 
     }
     
     template<typename Value, typename HashFunctions, typename Traits>
     template<typename T, typename HashSetTranslator> 
-    std::pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool> HashSet<Value, HashFunctions, Traits>::insert(const T& value)
-    {
-        return m_impl.template insert<T, T, HashSetTranslatorAdapter<ValueType, T, HashSetTranslator> >(value, value); 
+    std::pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool> HashSet<Value, HashFunctions, Traits>::add(const T& value)
+    {
+        return m_impl.template add<T, T, HashSetTranslatorAdapter<ValueType, T, HashSetTranslator> >(value, value); 
     }