<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[235151] trunk/Source/WebInspectorUI</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/235151">235151</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2018-08-21 18:08:47 -0700 (Tue, 21 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Remove TreeOutlineDataGridSynchronizer
https://bugs.webkit.org/show_bug.cgi?id=188449
<rdar://problem/43107980>

Reviewed by Devin Rousso.

* UserInterface/Views/HeapAllocationsTimelineView.js:
(WI.HeapAllocationsTimelineView.prototype.layout):
* UserInterface/Views/LayoutTimelineView.js:
(WI.LayoutTimelineView.prototype._processPendingRecords):
* UserInterface/Views/NetworkTimelineView.js:
(WI.NetworkTimelineView.prototype._processPendingRecords):
* UserInterface/Views/RenderingFrameTimelineView.js:
(WI.RenderingFrameTimelineView.prototype._processPendingRecords):
(WI.RenderingFrameTimelineView.prototype.dataGridNodeForTreeElement): Deleted.
* UserInterface/Views/ScriptDetailsTimelineView.js:
(WI.ScriptDetailsTimelineView.prototype._processPendingRecords):
* UserInterface/Views/TimelineDataGrid.js:
(WI.TimelineDataGrid):
(WI.TimelineDataGrid.prototype.reset):
(WI.TimelineDataGrid.prototype.shown):
(WI.TimelineDataGrid.prototype.addRowInSortOrder):
(WI.TimelineDataGrid.prototype._refreshDirtyDataGridNodes):
(WI.TimelineDataGrid.prototype._sort):
(WI.TimelineDataGrid.prototype.treeElementForDataGridNode): Deleted.
(WI.TimelineDataGrid.prototype.dataGridNodeForTreeElement): Deleted.
* UserInterface/Views/TreeOutlineDataGridSynchronizer.js: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptDetailsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/ChangeLog       2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2018-08-21  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Remove TreeOutlineDataGridSynchronizer
+        https://bugs.webkit.org/show_bug.cgi?id=188449
+        <rdar://problem/43107980>
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/HeapAllocationsTimelineView.js:
+        (WI.HeapAllocationsTimelineView.prototype.layout):
+        * UserInterface/Views/LayoutTimelineView.js:
+        (WI.LayoutTimelineView.prototype._processPendingRecords):
+        * UserInterface/Views/NetworkTimelineView.js:
+        (WI.NetworkTimelineView.prototype._processPendingRecords):
+        * UserInterface/Views/RenderingFrameTimelineView.js:
+        (WI.RenderingFrameTimelineView.prototype._processPendingRecords):
+        (WI.RenderingFrameTimelineView.prototype.dataGridNodeForTreeElement): Deleted.
+        * UserInterface/Views/ScriptDetailsTimelineView.js:
+        (WI.ScriptDetailsTimelineView.prototype._processPendingRecords):
+        * UserInterface/Views/TimelineDataGrid.js:
+        (WI.TimelineDataGrid):
+        (WI.TimelineDataGrid.prototype.reset):
+        (WI.TimelineDataGrid.prototype.shown):
+        (WI.TimelineDataGrid.prototype.addRowInSortOrder):
+        (WI.TimelineDataGrid.prototype._refreshDirtyDataGridNodes):
+        (WI.TimelineDataGrid.prototype._sort):
+        (WI.TimelineDataGrid.prototype.treeElementForDataGridNode): Deleted.
+        (WI.TimelineDataGrid.prototype.dataGridNodeForTreeElement): Deleted.
+        * UserInterface/Views/TreeOutlineDataGridSynchronizer.js: Removed.
+
</ins><span class="cx"> 2018-08-21  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: ⌘G does not while find banner is focused
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js   2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js      2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">         if (this._pendingRecords.length) {
</span><span class="cx">             for (let heapAllocationsTimelineRecord of this._pendingRecords) {
</span><span class="cx">                 let dataGridNode = new WI.HeapAllocationsTimelineDataGridNode(heapAllocationsTimelineRecord, this.zeroTime, this);
</span><del>-                this._dataGrid.addRowInSortOrder(null, dataGridNode);
</del><ins>+                this._dataGrid.addRowInSortOrder(dataGridNode);
</ins><span class="cx">                 if (!this.zeroTime)
</span><span class="cx">                     this._pendingZeroTimeDataGridNodes.push(dataGridNode);
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js    2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js       2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx">         for (var layoutTimelineRecord of this._pendingRecords) {
</span><span class="cx">             let dataGridNode = new WI.LayoutTimelineDataGridNode(layoutTimelineRecord, this.zeroTime);
</span><span class="cx"> 
</span><del>-            this._dataGrid.addRowInSortOrder(null, dataGridNode);
</del><ins>+            this._dataGrid.addRowInSortOrder(dataGridNode);
</ins><span class="cx"> 
</span><span class="cx">             let stack = [{children: layoutTimelineRecord.children, parentDataGridNode: dataGridNode, index: 0}];
</span><span class="cx">             while (stack.length) {
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> 
</span><span class="cx">                 let childDataGridNode = new WI.LayoutTimelineDataGridNode(childRecord, this.zeroTime);
</span><span class="cx">                 console.assert(entry.parentDataGridNode, "Missing parent node for entry.", entry);
</span><del>-                this._dataGrid.addRowInSortOrder(null, childDataGridNode, entry.parentDataGridNode);
</del><ins>+                this._dataGrid.addRowInSortOrder(childDataGridNode, entry.parentDataGridNode);
</ins><span class="cx"> 
</span><span class="cx">                 if (childDataGridNode && childRecord.children.length)
</span><span class="cx">                     stack.push({children: childRecord.children, parentDataGridNode: childDataGridNode, index: 0});
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js   2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js      2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">             dataGridNode = new WI.ResourceTimelineDataGridNode(resourceTimelineRecord, includesGraph, this, shouldShowPopover);
</span><span class="cx">             this._resourceDataGridNodeMap.set(resourceTimelineRecord.resource, dataGridNode);
</span><span class="cx"> 
</span><del>-            this._dataGrid.addRowInSortOrder(null, dataGridNode);
</del><ins>+            this._dataGrid.addRowInSortOrder(dataGridNode);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         this._pendingRecords = [];
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js    2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js       2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -195,13 +195,6 @@
</span><span class="cx">         dataGridNode.revealAndSelect();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    dataGridNodeForTreeElement(treeElement)
-    {
-        if (treeElement instanceof WI.ProfileNodeTreeElement)
-            return new WI.ProfileNodeDataGridNode(treeElement.profileNode, this.zeroTime, this.startTime, this.endTime);
-        return null;
-    }
-
</del><span class="cx">     matchDataGridNodeAgainstCustomFilters(node)
</span><span class="cx">     {
</span><span class="cx">         if (!super.matchDataGridNodeAgainstCustomFilters(node))
</span><span class="lines">@@ -240,7 +233,7 @@
</span><span class="cx">             console.assert(renderingFrameTimelineRecord instanceof WI.RenderingFrameTimelineRecord);
</span><span class="cx"> 
</span><span class="cx">             let dataGridNode = new WI.RenderingFrameTimelineDataGridNode(renderingFrameTimelineRecord, this.zeroTime);
</span><del>-            this._dataGrid.addRowInSortOrder(null, dataGridNode);
</del><ins>+            this._dataGrid.addRowInSortOrder(dataGridNode);
</ins><span class="cx"> 
</span><span class="cx">             let stack = [{children: renderingFrameTimelineRecord.children, parentDataGridNode: dataGridNode, index: 0}];
</span><span class="cx">             while (stack.length) {
</span><span class="lines">@@ -255,7 +248,7 @@
</span><span class="cx">                 if (childRecord.type === WI.TimelineRecord.Type.Layout) {
</span><span class="cx">                     childDataGridNode = new WI.LayoutTimelineDataGridNode(childRecord, this.zeroTime);
</span><span class="cx"> 
</span><del>-                    this._dataGrid.addRowInSortOrder(null, childDataGridNode, entry.parentDataGridNode);
</del><ins>+                    this._dataGrid.addRowInSortOrder(childDataGridNode, entry.parentDataGridNode);
</ins><span class="cx">                 } else if (childRecord.type === WI.TimelineRecord.Type.Script) {
</span><span class="cx">                     let rootNodes = [];
</span><span class="cx">                     if (childRecord.profile) {
</span><span class="lines">@@ -265,11 +258,11 @@
</span><span class="cx"> 
</span><span class="cx">                     childDataGridNode = new WI.ScriptTimelineDataGridNode(childRecord, this.zeroTime);
</span><span class="cx"> 
</span><del>-                    this._dataGrid.addRowInSortOrder(null, childDataGridNode, entry.parentDataGridNode);
</del><ins>+                    this._dataGrid.addRowInSortOrder(childDataGridNode, entry.parentDataGridNode);
</ins><span class="cx"> 
</span><span class="cx">                     for (let profileNode of rootNodes) {
</span><span class="cx">                         let profileNodeDataGridNode = new WI.ProfileNodeDataGridNode(profileNode, this.zeroTime, this.startTime, this.endTime);
</span><del>-                        this._dataGrid.addRowInSortOrder(null, profileNodeDataGridNode, childDataGridNode);
</del><ins>+                        this._dataGrid.addRowInSortOrder(profileNodeDataGridNode, childDataGridNode);
</ins><span class="cx">                     }
</span><span class="cx">                 }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptDetailsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js     2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js        2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -211,11 +211,11 @@
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             let dataGridNode = new WI.ScriptTimelineDataGridNode(scriptTimelineRecord, zeroTime);
</span><del>-            this._dataGrid.addRowInSortOrder(null, dataGridNode);
</del><ins>+            this._dataGrid.addRowInSortOrder(dataGridNode);
</ins><span class="cx"> 
</span><span class="cx">             for (let profileNode of rootNodes) {
</span><span class="cx">                 let profileNodeDataGridNode = new WI.ProfileNodeDataGridNode(profileNode, zeroTime, startTime, endTime);
</span><del>-                this._dataGrid.addRowInSortOrder(null, profileNodeDataGridNode, dataGridNode);
</del><ins>+                this._dataGrid.addRowInSortOrder(profileNodeDataGridNode, dataGridNode);
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js      2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -25,13 +25,10 @@
</span><span class="cx"> 
</span><span class="cx"> WI.TimelineDataGrid = class TimelineDataGrid extends WI.DataGrid
</span><span class="cx"> {
</span><del>-    constructor(columns, treeOutline, synchronizerDelegate, editCallback, deleteCallback)
</del><ins>+    constructor(columns, editCallback, deleteCallback)
</ins><span class="cx">     {
</span><span class="cx">         super(columns, editCallback, deleteCallback);
</span><span class="cx"> 
</span><del>-        if (treeOutline)
-            this._treeOutlineDataGridSynchronizer = new WI.TreeOutlineDataGridSynchronizer(treeOutline, this, synchronizerDelegate);
-
</del><span class="cx">         this.element.classList.add("timeline");
</span><span class="cx"> 
</span><span class="cx">         this._sortDelegate = null;
</span><span class="lines">@@ -101,8 +98,7 @@
</span><span class="cx">     {
</span><span class="cx">         // May be overridden by subclasses. If so, they should call the superclass.
</span><span class="cx"> 
</span><del>-        if (!this._treeOutlineDataGridSynchronizer)
-            this.removeChildren();
</del><ins>+        this.removeChildren();
</ins><span class="cx"> 
</span><span class="cx">         this._hidePopover();
</span><span class="cx">     }
</span><span class="lines">@@ -110,9 +106,6 @@
</span><span class="cx">     shown()
</span><span class="cx">     {
</span><span class="cx">         // May be overridden by subclasses. If so, they should call the superclass.
</span><del>-
-        if (this._treeOutlineDataGridSynchronizer)
-            this._treeOutlineDataGridSynchronizer.synchronize();
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     hidden()
</span><span class="lines">@@ -122,22 +115,6 @@
</span><span class="cx">         this._hidePopover();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    treeElementForDataGridNode(dataGridNode)
-    {
-        if (!this._treeOutlineDataGridSynchronizer)
-            return null;
-
-        return this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
-    }
-
-    dataGridNodeForTreeElement(treeElement)
-    {
-        if (!this._treeOutlineDataGridSynchronizer)
-            return null;
-
-        return this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(treeElement);
-    }
-
</del><span class="cx">     callFramePopoverAnchorElement()
</span><span class="cx">     {
</span><span class="cx">         // Implemented by subclasses.
</span><span class="lines">@@ -144,39 +121,15 @@
</span><span class="cx">         return null;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    addRowInSortOrder(treeElement, dataGridNode, parentTreeElementOrDataGridNode)
</del><ins>+    addRowInSortOrder(dataGridNode, parentDataGridNode)
</ins><span class="cx">     {
</span><del>-        let parentDataGridNode;
-        let childElement = dataGridNode;
</del><ins>+        parentDataGridNode = parentDataGridNode || this;
</ins><span class="cx"> 
</span><del>-        if (treeElement) {
-            console.assert(this._treeOutlineDataGridSynchronizer);
-            if (!this._treeOutlineDataGridSynchronizer)
-                return;
-
-            this._treeOutlineDataGridSynchronizer.associate(treeElement, dataGridNode);
-
-            console.assert(!parentTreeElementOrDataGridNode || parentTreeElementOrDataGridNode instanceof WI.TreeElement);
-
-            let parentTreeElement = parentTreeElementOrDataGridNode || this._treeOutlineDataGridSynchronizer.treeOutline;
-            parentDataGridNode = parentTreeElement.root ? this : this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(parentTreeElement);
-
-            parentTreeElementOrDataGridNode = parentTreeElement;
-            childElement = treeElement;
-        } else {
-            parentTreeElementOrDataGridNode = parentTreeElementOrDataGridNode || this;
-            parentDataGridNode = parentTreeElementOrDataGridNode;
-        }
-
</del><span class="cx">         if (this.sortColumnIdentifier) {
</span><span class="cx">             let insertionIndex = insertionIndexForObjectInListSortedByFunction(dataGridNode, parentDataGridNode.children, this._sortComparator.bind(this));
</span><del>-
-            // If parent is a tree element, the synchronizer will insert into the data grid.
-            parentTreeElementOrDataGridNode.insertChild(childElement, insertionIndex);
-        } else {
-            // If parent is a tree element, the synchronizer will append to the data grid.
-            parentTreeElementOrDataGridNode.appendChild(childElement);
-        }
</del><ins>+            parentDataGridNode.insertChild(dataGridNode, insertionIndex);
+        } else
+            parentDataGridNode.appendChild(dataGridNode);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     shouldIgnoreSelectionEvent()
</span><span class="lines">@@ -236,9 +189,6 @@
</span><span class="cx">         let selectedNode = this.selectedNode;
</span><span class="cx">         let sortComparator = this._sortComparator.bind(this);
</span><span class="cx"> 
</span><del>-        if (this._treeOutlineDataGridSynchronizer)
-            this._treeOutlineDataGridSynchronizer.enabled = false;
-
</del><span class="cx">         for (let dataGridNode of this._dirtyDataGridNodes) {
</span><span class="cx">             dataGridNode.refresh();
</span><span class="cx"> 
</span><span class="lines">@@ -259,24 +209,8 @@
</span><span class="cx">                 selectedNode.revealAndSelect();
</span><span class="cx">                 this._ignoreSelectionEvent = false;
</span><span class="cx">             }
</span><del>-
-            if (!this._treeOutlineDataGridSynchronizer)
-                continue;
-
-            let treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
-            let treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
-            console.assert(treeElement);
-
-            treeOutline.reattachIfIndexChanged(treeElement, insertionIndex);
-
-            // Adding the tree element back to the tree outline subjects it to filters.
-            // Make sure we keep the hidden state in-sync while the synchronizer is disabled.
-            dataGridNode.element.classList.toggle("hidden", treeElement.hidden);
</del><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (this._treeOutlineDataGridSynchronizer)
-            this._treeOutlineDataGridSynchronizer.enabled = true;
-
</del><span class="cx">         this._dirtyDataGridNodes = null;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -292,15 +226,6 @@
</span><span class="cx">         let selectedNode = this.selectedNode;
</span><span class="cx">         this._ignoreSelectionEvent = true;
</span><span class="cx"> 
</span><del>-        let treeOutline;
-        if (this._treeOutlineDataGridSynchronizer) {
-            this._treeOutlineDataGridSynchronizer.enabled = false;
-
-            treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
-            if (treeOutline.selectedTreeElement)
-                treeOutline.selectedTreeElement.deselect(true);
-        }
-
</del><span class="cx">         // Collect parent nodes that need their children sorted. So this in two phases since
</span><span class="cx">         // traverseNextNode would get confused if we sort the tree while traversing it.
</span><span class="cx">         let parentDataGridNodes = [this];
</span><span class="lines">@@ -315,37 +240,12 @@
</span><span class="cx">         for (let parentDataGridNode of parentDataGridNodes) {
</span><span class="cx">             let childDataGridNodes = parentDataGridNode.children.slice();
</span><span class="cx">             parentDataGridNode.removeChildren();
</span><del>-
-            let parentTreeElement;
-            if (this._treeOutlineDataGridSynchronizer) {
-                parentTreeElement = parentDataGridNode === this ? treeOutline : this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(parentDataGridNode);
-                console.assert(parentTreeElement);
-
-                parentTreeElement.removeChildren();
-            }
-
</del><span class="cx">             childDataGridNodes.sort(this._sortComparator.bind(this));
</span><span class="cx"> 
</span><del>-            for (let dataGridNode of childDataGridNodes) {
-                if (this._treeOutlineDataGridSynchronizer) {
-                    let treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
-                    console.assert(treeElement);
-
-                    if (parentTreeElement)
-                        parentTreeElement.appendChild(treeElement);
-
-                    // Adding the tree element back to the tree outline subjects it to filters.
-                    // Make sure we keep the hidden state in-sync while the synchronizer is disabled.
-                    dataGridNode.element.classList.toggle("hidden", treeElement.hidden);
-                }
-
</del><ins>+            for (let dataGridNode of childDataGridNodes)
</ins><span class="cx">                 parentDataGridNode.appendChild(dataGridNode);
</span><del>-            }
</del><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (this._treeOutlineDataGridSynchronizer)
-            this._treeOutlineDataGridSynchronizer.enabled = true;
-
</del><span class="cx">         if (selectedNode)
</span><span class="cx">             selectedNode.revealAndSelect();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js (235150 => 235151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js       2018-08-22 00:49:32 UTC (rev 235150)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js  2018-08-22 01:08:47 UTC (rev 235151)
</span><span class="lines">@@ -1,284 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013, 2015 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.TreeOutlineDataGridSynchronizer = class TreeOutlineDataGridSynchronizer extends WI.Object
-{
-    constructor(treeOutline, dataGrid, delegate)
-    {
-        super();
-
-        this._treeOutline = treeOutline;
-        this._dataGrid = dataGrid;
-        this._delegate = delegate || null;
-        this._enabled = true;
-
-        this._treeOutline.element.parentNode.addEventListener("scroll", this._treeOutlineScrolled.bind(this));
-        this._dataGrid.scrollContainer.addEventListener("scroll", this._dataGridScrolled.bind(this));
-
-        this._treeOutline.__dataGridNode = this._dataGrid;
-
-        this._dataGrid.addEventListener(WI.DataGrid.Event.ExpandedNode, this._dataGridNodeExpanded, this);
-        this._dataGrid.addEventListener(WI.DataGrid.Event.CollapsedNode, this._dataGridNodeCollapsed, this);
-        this._dataGrid.addEventListener(WI.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
-
-        this._dataGrid.element.addEventListener("focus", this._dataGridGainedFocus.bind(this));
-        this._dataGrid.element.addEventListener("blur", this._dataGridLostFocus.bind(this));
-
-        this._treeOutline.element.addEventListener("focus", this._treeOutlineGainedFocus.bind(this));
-        this._treeOutline.element.addEventListener("blur", this._treeOutlineLostFocus.bind(this));
-
-        treeOutline.addEventListener(WI.TreeOutline.Event.ElementAdded, this._treeElementAdded, this);
-        treeOutline.addEventListener(WI.TreeOutline.Event.ElementRemoved, this._treeElementRemoved, this);
-        treeOutline.addEventListener(WI.TreeOutline.Event.ElementDisclosureDidChanged, this._treeElementDisclosureDidChange, this);
-        treeOutline.addEventListener(WI.TreeOutline.Event.ElementVisibilityDidChange, this._treeElementVisibilityDidChange, this);
-        treeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
-    }
-
-    // Public
-
-    get treeOutline()
-    {
-        return this._treeOutline;
-    }
-
-    get dataGrid()
-    {
-        return this._dataGrid;
-    }
-
-    get delegate()
-    {
-        return this._delegate;
-    }
-
-    get enabled()
-    {
-        return this._enabled;
-    }
-
-    set enabled(x)
-    {
-        this._enabled = x || false;
-    }
-
-    associate(treeElement, dataGridNode)
-    {
-        console.assert(treeElement);
-        console.assert(dataGridNode);
-
-        treeElement.__dataGridNode = dataGridNode;
-        dataGridNode.__treeElement = treeElement;
-    }
-
-    synchronize()
-    {
-        this._dataGrid.scrollContainer.scrollTop = this._treeOutline.element.parentNode.scrollTop;
-        if (this._treeOutline.selectedTreeElement)
-            this._treeOutline.selectedTreeElement.__dataGridNode.select(true);
-        else if (this._dataGrid.selectedNode)
-            this._dataGrid.selectedNode.deselect(true);
-    }
-
-    treeElementForDataGridNode(dataGridNode)
-    {
-        return dataGridNode.__treeElement || null;
-    }
-
-    dataGridNodeForTreeElement(treeElement)
-    {
-        if (treeElement.__dataGridNode)
-            return treeElement.__dataGridNode;
-
-        if (typeof this._delegate.dataGridNodeForTreeElement === "function") {
-            var dataGridNode = this._delegate.dataGridNodeForTreeElement(treeElement);
-            if (dataGridNode)
-                this.associate(treeElement, dataGridNode);
-            return dataGridNode;
-        }
-
-        return null;
-    }
-
-    // Private
-
-    _treeOutlineScrolled(event)
-    {
-        if (!this._enabled)
-            return;
-
-        if (this._ignoreNextTreeOutlineScrollEvent) {
-            this._ignoreNextTreeOutlineScrollEvent = false;
-            return;
-        }
-
-        this._ignoreNextDataGridScrollEvent = true;
-        this._dataGrid.scrollContainer.scrollTop = this._treeOutline.element.parentNode.scrollTop;
-    }
-
-    _dataGridGainedFocus(event)
-    {
-        this._treeOutline.element.classList.add("force-focus");
-    }
-
-    _dataGridLostFocus(event)
-    {
-        this._treeOutline.element.classList.remove("force-focus");
-    }
-
-    _dataGridScrolled(event)
-    {
-        if (!this._enabled)
-            return;
-
-        if (this._ignoreNextDataGridScrollEvent) {
-            this._ignoreNextDataGridScrollEvent = false;
-            return;
-        }
-
-        this._ignoreNextTreeOutlineScrollEvent = true;
-        this._treeOutline.element.parentNode.scrollTop = this._dataGrid.scrollContainer.scrollTop;
-    }
-
-    _dataGridNodeSelected(event)
-    {
-        if (!this._enabled)
-            return;
-
-        var dataGridNode = this._dataGrid.selectedNode;
-        if (dataGridNode)
-            dataGridNode.__treeElement.select(true, true, true, true);
-    }
-
-    _dataGridNodeExpanded(event)
-    {
-        if (!this._enabled)
-            return;
-
-        var dataGridNode = event.data.dataGridNode;
-        console.assert(dataGridNode);
-
-        if (!dataGridNode.__treeElement.expanded)
-            dataGridNode.__treeElement.expand();
-    }
-
-    _dataGridNodeCollapsed(event)
-    {
-        if (!this._enabled)
-            return;
-
-        var dataGridNode = event.data.dataGridNode;
-        console.assert(dataGridNode);
-
-        if (dataGridNode.__treeElement.expanded)
-            dataGridNode.__treeElement.collapse();
-    }
-
-    _treeOutlineGainedFocus(event)
-    {
-        this._dataGrid.element.classList.add("force-focus");
-    }
-
-    _treeOutlineLostFocus(event)
-    {
-        this._dataGrid.element.classList.remove("force-focus");
-    }
-
-    _treeSelectionDidChange(event)
-    {
-        if (!this._enabled)
-            return;
-
-        let treeElement = event.data.selectedElement || event.data.deselectedElement;
-        console.assert(treeElement);
-        if (!treeElement)
-            return;
-
-        let dataGridNode = treeElement.__dataGridNode;
-        console.assert(dataGridNode);
-
-        if (event.data.selectedElement)
-            dataGridNode.select();
-        else
-            dataGridNode.deselect();
-    }
-
-    _treeElementAdded(event)
-    {
-        if (!this._enabled)
-            return;
-
-        let treeElement = event.data.element;
-        let dataGridNode = this.dataGridNodeForTreeElement(treeElement);
-        console.assert(dataGridNode);
-
-        var parentDataGridNode = treeElement.parent.__dataGridNode;
-        console.assert(parentDataGridNode);
-
-        var childIndex = treeElement.parent.children.indexOf(treeElement);
-        console.assert(childIndex !== -1);
-
-        parentDataGridNode.insertChild(dataGridNode, childIndex);
-    }
-
-    _treeElementRemoved(event)
-    {
-        if (!this._enabled)
-            return;
-
-        let treeElement = event.data.element;
-        let dataGridNode = treeElement.__dataGridNode;
-        console.assert(dataGridNode);
-
-        if (dataGridNode.parent)
-            dataGridNode.parent.removeChild(dataGridNode);
-    }
-
-    _treeElementDisclosureDidChange(event)
-    {
-        if (!this._enabled)
-            return;
-
-        let treeElement = event.data.element;
-        let dataGridNode = treeElement.__dataGridNode;
-        console.assert(dataGridNode);
-
-        if (treeElement.expanded)
-            dataGridNode.expand();
-        else
-            dataGridNode.collapse();
-    }
-
-    _treeElementVisibilityDidChange(event)
-    {
-        if (!this._enabled)
-            return;
-
-        let treeElement = event.data.element;
-        let dataGridNode = treeElement.__dataGridNode;
-        console.assert(dataGridNode);
-
-        dataGridNode.hidden = treeElement.hidden;
-    }
-};
</del></span></pre>
</div>
</div>

</body>
</html>