DevTools: Get rid of representedObject usages in ElementsTreeOutline.

Source/devtools/front_end/elements/ElementsTreeOutline.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 620 matching lines @@
     },
 
     _ondragstart: function(event)
     {
         if (!window.getSelection().isCollapsed)
             return false;
         if (event.target.nodeName === "A")
             return false;
 
         var treeElement = this._treeElementFromEvent(event);
-        if (!treeElement)
-            return false;
-
         if (!this._isValidDragSourceOrTarget(treeElement))
             return false;
 
         if (treeElement._node.nodeName() === "BODY" || treeElement._node.nodeName() === "HEAD")
             return false;
 
         event.dataTransfer.setData("text/plain", treeElement.listItemElement.textContent.replace(/\u200b/g, ""));
         event.dataTransfer.effectAllowed = "copyMove";
         this._treeElementBeingDragged = treeElement;
 
@@ skipping 35 matching lines @@
 
     /**
      * @param {?TreeElement} treeElement
      * @return {boolean}
      */
     _isValidDragSourceOrTarget: function(treeElement)
     {
         if (!treeElement)
             return false;
 
-        var node = treeElement.representedObject;
-        if (!(node instanceof WebInspector.DOMNode))
+        if (!(treeElement instanceof WebInspector.ElementsTreeElement))
             return false;
+        var elementsTreeElement = /** @type {!WebInspector.ElementsTreeElement} */ (treeElement);
 
+        var node = elementsTreeElement._node;
         if (!node.parentNode || node.parentNode.nodeType() !== Node.ELEMENT_NODE)
             return false;
 
         return true;
     },
 
     _ondrop: function(event)
     {
         event.preventDefault();
         var treeElement = this._treeElementFromEvent(event);
@@ skipping 329 matching lines @@
     "area", "base", "basefont", "br", "canvas", "col", "command", "embed", "frame",
     "hr", "img", "input", "keygen", "link", "menuitem", "meta", "param", "source", "track", "wbr"
 ].keySet();
 
 // These tags we do not allow editing their tag name.
 WebInspector.ElementsTreeElement.EditTagBlacklist = [
     "html", "head", "body"
 ].keySet();
 
 WebInspector.ElementsTreeElement.prototype = {
+    /**
+     * @return {!WebInspector.DOMNode}
+     */
+    node: function()
+    {
+        return this._node;
+    },
+
+    /**
+     * @param {string} searchQuery
+     */
     highlightSearchResults: function(searchQuery)
     {
         if (this._searchQuery !== searchQuery) {
             this._updateSearchHighlight(false);
             delete this._highlightResult; // A new search query.
         }
 
         this._searchQuery = searchQuery;
         this._searchHighlightsVisible = true;
         this.updateTitle(true);
     },
 
     hideSearchHighlights: function()
     {
         delete this._searchHighlightsVisible;
         this._updateSearchHighlight(false);
     },
 
+    /**
+     * @param {boolean} show
+     */
     _updateSearchHighlight: function(show)
     {
         if (!this._highlightResult)
             return;
 
         function updateEntryShow(entry)
         {
             switch (entry.type) {
                 case "added":
                     entry.parent.insertBefore(entry.node, entry.nextSibling);
@@ skipping 476 matching lines @@
         if (this.hasChildren && !this.expanded)
             this.expand();
         return false;
     },
 
     /**
      * @return {boolean}
      */
     hasEditableNode: function()
     {
-        return !this.representedObject.isShadowRoot() && !this.representedObject.ancestorUserAgentShadowRoot();
+        return !this._node.isShadowRoot() && !this._node.ancestorUserAgentShadowRoot();
     },
 
     _insertInLastAttributePosition: function(tag, node)
     {
         if (tag.getElementsByClassName("webkit-html-attribute").length > 0)
             tag.insertBefore(node, tag.lastChild);
         else {
             var nodeName = tag.textContent.match(/^<(.*?)>$/)[1];
             tag.textContent = '';
             tag.createTextChild('<' + nodeName);
@@ skipping 85 matching lines @@
     _populateTextContextMenu: function(contextMenu, textNode)
     {
         if (!this._editing)
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Edit text" : "Edit Text"), this._startEditingTextNode.bind(this, textNode));
         this._populateNodeContextMenu(contextMenu);
     },
 
     _populateNodeContextMenu: function(contextMenu)
     {
         // Add free-form node-related actions.
-        var openTagElement = this.treeOutline.getCachedTreeElement(this.representedObject) || this;
+        var openTagElement = this.treeOutline.getCachedTreeElement(this._node) || this;
         var isEditable = this.hasEditableNode();
         if (isEditable && !this._editing)
             contextMenu.appendItem(WebInspector.UIString("Edit as HTML"), openTagElement._editAsHTML.bind(openTagElement));
-        var isShadowRoot = this.representedObject.isShadowRoot();
+        var isShadowRoot = this._node.isShadowRoot();
 
         // Place it here so that all "Copy"-ing items stick together.
-        if (this.representedObject.nodeType() === Node.ELEMENT_NODE)
+        if (this._node.nodeType() === Node.ELEMENT_NODE)
             contextMenu.appendItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Copy CSS path" : "Copy CSS Path"), this._copyCSSPath.bind(this));
         if (!isShadowRoot)
             contextMenu.appendItem(WebInspector.UIString("Copy XPath"), this._copyXPath.bind(this));
         if (!isShadowRoot) {
             var treeOutline = this.treeOutline;
             contextMenu.appendSeparator();
-            contextMenu.appendItem(WebInspector.UIString("Cut"), treeOutline._performCopyOrCut.bind(treeOutline, true, this.representedObject), !this.hasEditableNode());
-            contextMenu.appendItem(WebInspector.UIString("Copy"), treeOutline._performCopyOrCut.bind(treeOutline, false, this.representedObject));
-            contextMenu.appendItem(WebInspector.UIString("Paste"), treeOutline._pasteNode.bind(treeOutline, this.representedObject), !treeOutline._canPaste(this.representedObject));
+            contextMenu.appendItem(WebInspector.UIString("Cut"), treeOutline._performCopyOrCut.bind(treeOutline, true, this._node), !this.hasEditableNode());
+            contextMenu.appendItem(WebInspector.UIString("Copy"), treeOutline._performCopyOrCut.bind(treeOutline, false, this._node));
+            contextMenu.appendItem(WebInspector.UIString("Paste"), treeOutline._pasteNode.bind(treeOutline, this._node), !treeOutline._canPaste(this._node));
         }
 
         if (isEditable)
             contextMenu.appendItem(WebInspector.UIString("Delete"), this.remove.bind(this));
         contextMenu.appendSeparator();
     },
 
     _startEditing: function()
     {
         if (this.treeOutline.selectedDOMNode() !== this._node)
@@ skipping 44 matching lines @@
 
                     if (elem.classList.contains("webkit-html-attribute-value"))
                         return this._startEditingAttribute(elem.parentNode, elem);
                 }
             }
         }
     },
 
     _startEditingAttribute: function(attribute, elementForSelection)
     {
+        console.assert(this.listItemElement.isAncestor(attribute));
+
         if (WebInspector.isBeingEdited(attribute))
             return true;
 
         var attributeNameElement = attribute.getElementsByClassName("webkit-html-attribute-name")[0];
         if (!attributeNameElement)
             return false;
 
         var attributeName = attributeNameElement.textContent;
         var attributeValueElement = attribute.getElementsByClassName("webkit-html-attribute-value")[0];
 
         function removeZeroWidthSpaceRecursive(node)
         {
             if (node.nodeType === Node.TEXT_NODE) {
                 node.nodeValue = node.nodeValue.replace(/\u200B/g, "");
                 return;
             }
 
             if (node.nodeType !== Node.ELEMENT_NODE)
                 return;
 
             for (var child = node.firstChild; child; child = child.nextSibling)
                 removeZeroWidthSpaceRecursive(child);
         }
 
-        var domNode;
-        var listItemElement = attribute.enclosingNodeOrSelfWithNodeName("li");
-        if (attributeName && attributeValueElement && listItemElement && listItemElement.treeElement)
-            domNode = listItemElement.treeElement.representedObject;
-        var attributeValue = domNode ? domNode.getAttribute(attributeName) : undefined;
-        if (typeof attributeValue !== "undefined")
+        var attributeValue = attributeName && attributeValueElement ? this._node.getAttribute(attributeName) : undefined;
+        if (attributeValue !== undefined)
             attributeValueElement.textContent = attributeValue;
 
         // Remove zero-width spaces that were added by nodeTitleInfo.
         removeZeroWidthSpaceRecursive(attribute);
 
         var config = new WebInspector.InplaceEditor.Config(this._attributeEditingCommitted.bind(this), this._editingCancelled.bind(this), attributeName);
 
         function handleKeyDownEvents(event)
         {
             var isMetaOrCtrl = WebInspector.isMac() ?
@@ skipping 1171 matching lines @@
                 treeOutline.rootDOMNode = node;
                 if (!treeOutline.children[0].hasChildren)
                     treeOutline._element.classList.add("single-node");
                 treeOutline.setVisible(true);
                 treeOutline.element.treeElementForTest = treeOutline.children[0];
                 resolve(treeOutline.element);
             }
         }
     }
 }