Changeset 27385 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Nov 2, 2007, 5:30:44 PM (18 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Maciej.

• ​http://bugs.webkit.org/show_bug.cgi?id=15807 HashMap needs a take() function that combines get and remove

• wtf/HashMap.h: Added take function. Simplistic implementation for now, but still does only one hash table lookup.

• kjs/array_instance.cpp: (KJS::ArrayInstance::put): Use take rather than a find followed by a remove.

WebCore:

Reviewed by Maciej.

• use the new HashMap::take function where appropriate

• bindings/js/kjs_binding.cpp: (KJS::addWrapper): Made an inline rather than a macro; inlines good, macros bad. (KJS::removeWrapper): Ditto. (KJS::removeWrappers): Ditto. (KJS::ScriptInterpreter::putDOMObject): Use the inline instead of the macro. (KJS::ScriptInterpreter::forgetDOMObject): Ditto. This involves using take instead of remove -- in theory ever so slightly less efficient, but I think it's fine. (KJS::ScriptInterpreter::forgetDOMNodeForDocument): Ditto. (KJS::ScriptInterpreter::putDOMNodeForDocument): Use the inline instead of the macro. (KJS::ScriptInterpreter::forgetAllDOMNodesForDocument): Use take instead of find/remove. (KJS::ScriptInterpreter::updateDOMNodeDocument): Use the inlines instead of the macros.

• bindings/js/kjs_window.cpp: (KJS::Window::clearTimeout): Use take instead of find/remove.
• bridge/mac/AXObjectCacheMac.mm: (WebCore::AXObjectCache::remove): Ditto.
• page/AnimationController.cpp: (WebCore::AnimationControllerPrivate::clear): Ditto.
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::~RenderBlock): Ditto. (WebCore::RenderBlock::setDesiredColumnCountAndWidth): Ditto.
• rendering/RootInlineBox.cpp: Ditto.(WebCore::RootInlineBox::detachEllipsisBox): Ditto.

File:

• trunk/JavaScriptCore/wtf/HashMap.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/HashMap.h

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- * This file is part of the KDE libraries
- *
- * Copyright (C) 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -98 +96 @@
 
         void remove(const KeyType&);
-        void remove(iterator it);
+        void remove(iterator);
         void clear();
+
+        MappedType take(const KeyType&); // efficient combination of get with remove
 
     private:
@@ -325 +325 @@
     }
 
+    template<typename T, typename U, typename V, typename W, typename MappedTraits>
+    typename HashMap<T, U, V, W, MappedTraits>::MappedType
+    HashMap<T, U, V, W, MappedTraits>::take(const KeyType& key)
+    {
+        // This can probably be made more efficient to avoid ref/deref churn.
+        iterator it = find(key);
+        if (it == end())
+            return MappedTraits::emptyValue();
+        typename HashMap<T, U, V, W, MappedTraits>::MappedType result = it->second;
+        remove(it);
+        return result;
+    }
+
     template<typename T, typename U, typename V, typename W, typename X>
     bool operator==(const HashMap<T, U, V, W, X>& a, const HashMap<T, U, V, W, X>& b)