Changeset 102447 in webkit

Timestamp:

Dec 9, 2011 1:25:58 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Introduce a Map class allowing to store values indexed by arbitrary objects.
​https://bugs.webkit.org/show_bug.cgi?id=74084

Reviewed by Pavel Feldman.

Source/WebCore:

Test: inspector/map.html

• inspector/front-end/treeoutline.js:

(TreeOutline):
():
(TreeElement.prototype.collapse):
(TreeElement.prototype.expand):

• inspector/front-end/utilities.js:

():

LayoutTests:

• inspector/map-expected.txt: Added.
• inspector/map.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/map-expected.txt (added)
• LayoutTests/inspector/map.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/treeoutline.js (modified) (10 diffs)
• Source/WebCore/inspector/front-end/utilities.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-08  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Introduce a Map class allowing to store values indexed by arbitrary objects.
+        https://bugs.webkit.org/show_bug.cgi?id=74084
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/map-expected.txt: Added.
+        * inspector/map.html: Added.
+
 2011-12-09  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-08  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Introduce a Map class allowing to store values indexed by arbitrary objects.
+        https://bugs.webkit.org/show_bug.cgi?id=74084
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/map.html
+
+        * inspector/front-end/treeoutline.js:
+        (TreeOutline):
+        ():
+        (TreeElement.prototype.collapse):
+        (TreeElement.prototype.expand):
+        * inspector/front-end/utilities.js:
+        ():
+
 2011-12-09  Peter Rybin  <peter.rybin@gmail.com>
 

trunk/Source/WebCore/inspector/front-end/treeoutline.js

@@ -39 +39 @@
     this._childrenListNode = listNode;
     this._childrenListNode.removeChildren();
-    this._knownTreeElements = [];
-    this._treeElementsExpandedState = [];
     this.expandTreeElementsWhenArrowing = false;
     this.root = true;
@@ -50 +48 @@
     this._childrenListNode.tabIndex = 0;
     this._childrenListNode.addEventListener("keydown", this._treeKeyDown.bind(this), true);
-}
-
-TreeOutline._knownTreeElementNextIdentifier = 1;
+    
+    this._treeElementsMap = new Map();
+    this._expandedStateMap = new Map();
+}
 
 TreeOutline.prototype.appendChild = function(child)
@@ -81 +80 @@
     }
 
-    if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
-        child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
+    child.expanded = child.hasChildren && !!child.treeOutline._expandedStateMap.get(child.representedObject);
 
     if (!this._childrenListNode) {
@@ -132 +130 @@
     }
 
-    if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
-        child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
+    child.expanded = child.hasChildren && !!child.treeOutline._expandedStateMap.get(child.representedObject);
 
     if (!this._childrenListNode) {
@@ -246 +243 @@
 TreeOutline.prototype._rememberTreeElement = function(element)
 {
-    if (!this._knownTreeElements[element.identifier])
-        this._knownTreeElements[element.identifier] = [];
-
+    if (!this._treeElementsMap.get(element.representedObject))
+        this._treeElementsMap.put(element.representedObject, []);
+        
     // check if the element is already known
-    var elements = this._knownTreeElements[element.identifier];
+    var elements = this._treeElementsMap.get(element.representedObject);
     if (elements.indexOf(element) !== -1)
         return;
@@ -260 +257 @@
 TreeOutline.prototype._forgetTreeElement = function(element)
 {
-    if (this._knownTreeElements[element.identifier])
-        this._knownTreeElements[element.identifier].remove(element, true);
+    if (this._treeElementsMap.get(element.representedObject))
+        this._treeElementsMap.get(element.representedObject).remove(element, true);
 }
 
@@ -278 +275 @@
         return null;
 
-    if ("__treeElementIdentifier" in representedObject) {
-        // If this representedObject has a tree element identifier, and it is a known TreeElement
-        // in our tree we can just return that tree element.
-        var elements = this._knownTreeElements[representedObject.__treeElementIdentifier];
-        if (elements) {
-            for (var i = 0; i < elements.length; ++i)
-                if (elements[i].representedObject === representedObject)
-                    return elements[i];
-        }
-    }
+    var elements = this._treeElementsMap.get(representedObject);
+    if (elements && elements.length)
+        return elements[0];
     return null;
 }
@@ -480 +470 @@
     this.representedObject = (representedObject || {});
 
-    if (this.representedObject.__treeElementIdentifier)
-        this.identifier = this.representedObject.__treeElementIdentifier;
-    else {
-        this.identifier = TreeOutline._knownTreeElementNextIdentifier++;
-        this.representedObject.__treeElementIdentifier = this.identifier;
-    }
-
     this._hidden = false;
     this._selectable = true;
@@ -743 +726 @@
 
     this.expanded = false;
+    
     if (this.treeOutline)
-        this.treeOutline._treeElementsExpandedState[this.identifier] = false;
+        this.treeOutline._expandedStateMap.put(this.representedObject, false);
 
     if (this.oncollapse)
@@ -771 +755 @@
     this.expanded = true;
     if (this.treeOutline)
-        this.treeOutline._treeElementsExpandedState[this.identifier] = true;
+        this.treeOutline._expandedStateMap.put(this.representedObject, true);
 
     if (this.treeOutline && (!this._childrenListNode || this._shouldRefreshChildren)) {

trunk/Source/WebCore/inspector/front-end/utilities.js

@@ -1150 +1150 @@
     return diffData;
 }
+
+/**
+ * @constructor
+ */
+Map = function()
+{
+    this._map = {};
+}
+
+Map._lastObjectIdentifier = 0;
+
+Map.prototype = {
+    /**
+     * @param {Object} key
+     */
+    put: function(key, value)
+    {
+        var objectIdentifier = key.__identifier;
+        if (!objectIdentifier) {
+            objectIdentifier = ++Map._lastObjectIdentifier;
+            key.__identifier = objectIdentifier;
+        }
+        this._map[objectIdentifier] = value;
+    },
+    
+    /**
+     * @param {Object} key
+     */
+    remove: function(key)
+    {
+        delete this._map[key.__identifier];
+    },
+    
+    /**
+     * @param {Object} key
+     */
+    get: function(key)
+    {
+        return this._map[key.__identifier];
+    },
+}