<!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>[193061] branches/safari-601-branch/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/193061">193061</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:41:46 -0800 (Thu, 03 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187929">r187929</a>. rdar://problem/23221163</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineRecordjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193060 => 193061)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:41:40 UTC (rev 193060)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-03 18:41:46 UTC (rev 193061)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-12-01  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r187929. rdar://problem/23221163
+
+    2015-08-04  Matt Baker  &lt;mattbaker@apple.com&gt;
+
+            Web Inspector: Layout &amp; Rendering timeline grid should show TimelineRecord parent/child relationships
+            https://bugs.webkit.org/show_bug.cgi?id=147468
+
+            Reviewed by Brian Burg.
+
+            Layout timeline data grid now shows record nesting for Layout and Composite events.
+
+            * UserInterface/Controllers/TimelineManager.js:
+            (WebInspector.TimelineManager.prototype.eventRecorded):
+            * UserInterface/Models/TimelineRecord.js:
+            (WebInspector.TimelineRecord.prototype.get parent):
+            (WebInspector.TimelineRecord.prototype.set parent):
+            Preserve timeline record parent/child relationship.
+
+            * UserInterface/Views/LayoutTimelineView.js:
+            (WebInspector.LayoutTimelineView):
+            Style change for disclosure triangle support.
+            (WebInspector.LayoutTimelineView.prototype._layoutTimelineRecordAdded):
+            Only process immediate children of the rendering frame record.
+
+2015-12-01  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
</ins><span class="cx">         Merge r187923. rdar://problem/23221163
</span><span class="cx"> 
</span><span class="cx">     2015-08-04  Devin Rousso  &lt;drousso@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193060 => 193061)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js        2015-12-03 18:41:40 UTC (rev 193060)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js        2015-12-03 18:41:46 UTC (rev 193061)
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx">                 var recordPayload = recordPayloads[entry.index];
</span><span class="cx">                 var record = this._processEvent(recordPayload, entry.parent);
</span><span class="cx">                 if (record) {
</span><ins>+                    record.parent = entry.parentRecord;
</ins><span class="cx">                     records.push(record);
</span><span class="cx">                     if (entry.parentRecord)
</span><span class="cx">                         entry.parentRecord.children.push(record);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js (193060 => 193061)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js        2015-12-03 18:41:40 UTC (rev 193060)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/TimelineRecord.js        2015-12-03 18:41:46 UTC (rev 193061)
</span><span class="lines">@@ -122,6 +122,19 @@
</span><span class="cx">         return this._sourceCodeLocation;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    get parent()
+    {
+        return this._parent;
+    }
+
+    set parent(x)
+    {
+        if (this._parent === x)
+            return;
+
+        this._parent = x;
+    }
+
</ins><span class="cx">     get children()
</span><span class="cx">     {
</span><span class="cx">         return this._children;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (193060 => 193061)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js        2015-12-03 18:41:40 UTC (rev 193060)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js        2015-12-03 18:41:46 UTC (rev 193061)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> 
</span><span class="cx">         console.assert(timeline.type === WebInspector.TimelineRecord.Type.Layout, timeline);
</span><span class="cx"> 
</span><del>-        this.navigationSidebarTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.HideDisclosureButtonsStyleClassName);
</del><span class="cx">         this.navigationSidebarTreeOutline.element.classList.add(&quot;layout&quot;);
</span><span class="cx"> 
</span><span class="cx">         var columns = {eventType: {}, location: {}, width: {}, height: {}, startTime: {}, totalTime: {}};
</span><span class="lines">@@ -196,6 +195,27 @@
</span><span class="cx">             var dataGridNode = new WebInspector.LayoutTimelineDataGridNode(layoutTimelineRecord, this.zeroTime);
</span><span class="cx"> 
</span><span class="cx">             this._dataGrid.addRowInSortOrder(treeElement, dataGridNode);
</span><ins>+
+            var stack = [{children: layoutTimelineRecord.children, parentTreeElement: treeElement, index: 0}];
+            while (stack.length) {
+                var entry = stack.lastValue;
+                if (entry.index &gt;= entry.children.length) {
+                    stack.pop();
+                    continue;
+                }
+
+                var childRecord = entry.children[entry.index];
+                console.assert(childRecord.type === WebInspector.TimelineRecord.Type.Layout, childRecord);
+
+                var childTreeElement = new WebInspector.TimelineRecordTreeElement(childRecord, WebInspector.SourceCodeLocation.NameStyle.Short);
+                var layoutDataGridNode = new WebInspector.LayoutTimelineDataGridNode(childRecord, this.zeroTime);
+                console.assert(entry.parentTreeElement, &quot;entry without parent!&quot;);
+                this._dataGrid.addRowInSortOrder(childTreeElement, layoutDataGridNode, entry.parentTreeElement);
+
+                if (childTreeElement &amp;&amp; childRecord.children.length)
+                    stack.push({children: childRecord.children, parentTreeElement: childTreeElement, index: 0});
+                ++entry.index;
+            }
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         this._pendingRecords = [];
</span><span class="lines">@@ -206,6 +226,10 @@
</span><span class="cx">         var layoutTimelineRecord = event.data.record;
</span><span class="cx">         console.assert(layoutTimelineRecord instanceof WebInspector.LayoutTimelineRecord);
</span><span class="cx"> 
</span><ins>+        // Only add top-level records, to avoid processing child records multiple times.
+        if (!(layoutTimelineRecord.parent instanceof WebInspector.RenderingFrameTimelineRecord))
+            return;
+
</ins><span class="cx">         this._pendingRecords.push(layoutTimelineRecord);
</span><span class="cx"> 
</span><span class="cx">         this.needsLayout();
</span></span></pre>
</div>
</div>

</body>
</html>