Changeset 213565 in webkit

Timestamp:

Mar 7, 2017 9:18:35 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: DOM Tree broken if an element has a "debounce" attribute
​https://bugs.webkit.org/show_bug.cgi?id=169336
<rdar://problem/30899430>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-03-07
Reviewed by Brian Burg.

• UserInterface/Models/DOMNode.js:

(WebInspector.DOMNode):
(WebInspector.DOMNode.prototype.getAttribute):
(WebInspector.DOMNode.prototype.removeAttribute.mycallback):
(WebInspector.DOMNode.prototype.removeAttribute):
Convert the attributes map to an actual Map to avoid name collisions
with Object.prototype properties.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/DOMNode.js (modified) (7 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-03-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: DOM Tree broken if an element has a "debounce" attribute
+        https://bugs.webkit.org/show_bug.cgi?id=169336
+        <rdar://problem/30899430>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Models/DOMNode.js:
+        (WebInspector.DOMNode):
+        (WebInspector.DOMNode.prototype.getAttribute):
+        (WebInspector.DOMNode.prototype.removeAttribute.mycallback):
+        (WebInspector.DOMNode.prototype.removeAttribute):
+        Convert the attributes map to an actual Map to avoid name collisions
+        with Object.prototype properties.
+
 2017-03-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js

@@ -58 +58 @@
 
         this._attributes = [];
-        this._attributesMap = {};
+        this._attributesMap = new Map;
         if (payload.attributes)
             this._setAttributesPayload(payload.attributes);
@@ -388 +388 @@
     getAttribute(name)
     {
-        var attr = this._attributesMap[name];
+        let attr = this._attributesMap.get(name);
         return attr ? attr.value : undefined;
     }
@@ -412 +412 @@
         {
             if (!error) {
-                delete this._attributesMap[name];
+                this._attributesMap.delete(name);
                 for (var i = 0; i < this._attributes.length; ++i) {
                     if (this._attributes[i].name === name) {
@@ -670 +670 @@
     {
         this._attributes = [];
-        this._attributesMap = {};
+        this._attributesMap = new Map;
         for (var i = 0; i < attrs.length; i += 2)
             this._addAttribute(attrs[i], attrs[i + 1]);
@@ -736 +736 @@
     _addAttribute(name, value)
     {
-        var attr = {name, value, _node: this};
-        this._attributesMap[name] = attr;
+        let attr = {name, value, _node: this};
+        this._attributesMap.set(name, attr);
         this._attributes.push(attr);
     }
@@ -743 +743 @@
     _setAttribute(name, value)
     {
-        var attr = this._attributesMap[name];
+        let attr = this._attributesMap.get(name);
         if (attr)
             attr.value = value;
@@ -752 +752 @@
     _removeAttribute(name)
     {
-        var attr = this._attributesMap[name];
+        let attr = this._attributesMap.get(name);
         if (attr) {
             this._attributes.remove(attr);
-            delete this._attributesMap[name];
+            this._attributesMap.delete(name);
         }
     }