[DevTools] Do not toggle tree element if there is a selection.

third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 350 matching lines @@
     this.treeOutline = null;
     this.parent = null;
     this.previousSibling = null;
     this.nextSibling = null;
 
     this._listItemNode = createElement("li");
     this._listItemNode.treeElement = this;
     if (title)
         this.title = title;
     this._listItemNode.addEventListener("mousedown", this._handleMouseDown.bind(this), false);
-    this._listItemNode.addEventListener("selectstart", this._treeElementSelectStart.bind(this), false);
     this._listItemNode.addEventListener("click", this._treeElementToggled.bind(this), false);
     this._listItemNode.addEventListener("dblclick", this._handleDoubleClick.bind(this), false);
 
     this._childrenListNode = createElement("ol");
     this._childrenListNode.parentTreeElement = this;
     this._childrenListNode.classList.add("children");
 
     this._hidden = false;
     this._selectable = true;
     this.expanded = false;
@@ skipping 390 matching lines @@
         if (!this.treeOutline || !this.treeOutline._renderSelection)
             return;
         if (!this._selectionElement)
             this._selectionElement = createElementWithClass("div", "selection fill");
         this._listItemNode.insertBefore(this._selectionElement, this.listItemElement.firstChild);
     },
 
     /**
      * @param {!Event} event
      */
-    _treeElementSelectStart: function(event)
-    {
-        event.currentTarget._selectionStarted = true;
-    },
-
-    /**
-     * @param {!Event} event
-     */
     _treeElementToggled: function(event)
     {
         var element = event.currentTarget;
-        if (element._selectionStarted) {
-            delete element._selectionStarted;
-            var selection = element.getComponentSelection();
-            if (selection && !selection.isCollapsed && element.isSelfOrAncestor(selection.anchorNode) && element.isSelfOrAncestor(selection.focusNode))
-                return;
-        }
-
-        if (element.treeElement !== this)
+        if (element.treeElement !== this || element.hasSelection())

[pfeldman, 2016/09/16 22:54:18]

hasSelection returns true upon mouse down?

[dgozman, 2016/09/16 23:00:47]

Correct.

             return;
 
         var toggleOnClick = this.toggleOnClick && !this.selectable;
         var isInTriangle = this.isEventWithinDisclosureTriangle(event);
         if (!toggleOnClick && !isInTriangle)
             return;
 
         if (event.target && event.target.enclosingNodeOrSelfWithNodeName("a"))
             return;
 
@@ skipping 12 matching lines @@
     },
 
     /**
      * @param {!Event} event
      */
     _handleMouseDown: function(event)
     {
         var element = event.currentTarget;
         if (!element)
             return;
-        delete element._selectionStarted;
-
         if (!this.selectable)
             return;
         if (element.treeElement !== this)
             return;
 
         if (this.isEventWithinDisclosureTriangle(event))
             return;
 
         this.selectOnMouseDown(event);
     },
@@ skipping 324 matching lines @@
     isEventWithinDisclosureTriangle: function(event)
     {
         // FIXME: We should not use getComputedStyle(). For that we need to get rid of using ::before for disclosure triangle. (http://webk.it/74446)
         var paddingLeftValue = window.getComputedStyle(this._listItemNode).paddingLeft;
         console.assert(paddingLeftValue.endsWith("px"));
         var computedLeftPadding = parseFloat(paddingLeftValue);
         var left = this._listItemNode.totalOffsetLeft() + computedLeftPadding;
         return event.pageX >= left && event.pageX <= left + TreeElement._ArrowToggleWidth && this._expandable;
     }
 }