<!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>[193096] 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/193096">193096</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:46:18 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188398">r188398</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsRenderingFrameTimelineRecordjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.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 (193095 => 193096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:46:12 UTC (rev 193095)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:46:18 UTC (rev 193096)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188398. rdar://problem/23221163
+
+ 2015-08-13 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Hide child rows for filtered tasks in the Rendering Frames data grid
+ https://bugs.webkit.org/show_bug.cgi?id=147960
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/RenderingFrameTimelineRecord.js:
+ (WebInspector.RenderingFrameTimelineRecord.taskTypeForTimelineRecord):
+ New static method for mapping TimelineRecords to rendering frame tasks.
+ (WebInspector.RenderingFrameTimelineRecord.prototype.durationForTask):
+ Refactored to use taskTypeForTimelineRecord.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+ Task filtering is applied to children of the frame record only. Parent frame
+ record is hidden by default, and visible by virtue of having unfiltered children.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188396. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-13 Matt Baker <mattbaker@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsRenderingFrameTimelineRecordjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js (193095 => 193096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js 2015-12-03 18:46:12 UTC (rev 193095)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js 2015-12-03 18:46:18 UTC (rev 193096)
</span><span class="lines">@@ -54,6 +54,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static taskTypeForTimelineRecord(record)
+ {
+ switch(record.type) {
+ case WebInspector.TimelineRecord.Type.Script:
+ return WebInspector.RenderingFrameTimelineRecord.TaskType.Script;
+ case WebInspector.TimelineRecord.Type.Layout:
+ if (record.eventType === WebInspector.LayoutTimelineRecord.EventType.Paint || record.eventType === WebInspector.LayoutTimelineRecord.EventType.Composite)
+ return WebInspector.RenderingFrameTimelineRecord.TaskType.Paint;
+ return WebInspector.RenderingFrameTimelineRecord.TaskType.Layout;
+ default:
+ console.error("Unsupported timeline record type: " + record.type);
+ return null;
+ }
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get frameIndex()
</span><span class="lines">@@ -71,27 +86,12 @@
</span><span class="cx"> if (this._durationByTaskType.has(taskType))
</span><span class="cx"> return this._durationByTaskType.get(taskType);
</span><span class="cx">
</span><del>- function validRecordForTaskType(record)
- {
- switch(taskType) {
- case WebInspector.RenderingFrameTimelineRecord.TaskType.Script:
- return record.type === WebInspector.TimelineRecord.Type.Script;
- case WebInspector.RenderingFrameTimelineRecord.TaskType.Layout:
- return record.type === WebInspector.TimelineRecord.Type.Layout && record.eventType !== WebInspector.LayoutTimelineRecord.EventType.Paint && record.eventType !== WebInspector.LayoutTimelineRecord.EventType.Composite;
- case WebInspector.RenderingFrameTimelineRecord.TaskType.Paint:
- return record.eventType === WebInspector.LayoutTimelineRecord.EventType.Paint || record.eventType === WebInspector.LayoutTimelineRecord.EventType.Composite;
- default:
- console.error("Unsupported task type: " + taskType);
- return false;
- }
- }
-
</del><span class="cx"> var duration;
</span><span class="cx"> if (taskType === WebInspector.RenderingFrameTimelineRecord.TaskType.Other)
</span><span class="cx"> duration = this._calculateDurationRemainder();
</span><span class="cx"> else {
</span><span class="cx"> duration = this.children.reduce(function(previousValue, currentValue) {
</span><del>- if (!validRecordForTaskType(currentValue))
</del><ins>+ if (taskType !== WebInspector.RenderingFrameTimelineRecord.taskTypeForTimelineRecord(currentValue))
</ins><span class="cx"> return previousValue;
</span><span class="cx">
</span><span class="cx"> var currentDuration = currentValue.duration;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (193095 => 193096)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 18:46:12 UTC (rev 193095)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 18:46:18 UTC (rev 193096)
</span><span class="lines">@@ -400,23 +400,18 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (this._viewMode === WebInspector.TimelineSidebarPanel.ViewMode.RenderingFrames && this._renderingFrameTaskFilter.size) {
</span><del>- while (treeElement && !(treeElement.record instanceof WebInspector.RenderingFrameTimelineRecord))
</del><ins>+ while (treeElement && !(treeElement.record instanceof WebInspector.TimelineRecord))
</ins><span class="cx"> treeElement = treeElement.parent;
</span><span class="cx">
</span><del>- console.assert(treeElement, "Cannot apply task filter: no RenderingFrameTimelineRecord found.");
</del><ins>+ console.assert(treeElement, "Cannot apply task filter: no TimelineRecord found.");
</ins><span class="cx"> if (!treeElement)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> var visible = false;
</span><del>- for (var key in WebInspector.RenderingFrameTimelineRecord.TaskType) {
- var taskType = WebInspector.RenderingFrameTimelineRecord.TaskType[key];
- if (taskType === WebInspector.RenderingFrameTimelineRecord.TaskType.Other)
- continue;
-
- if (!this._renderingFrameTaskFilter.has(taskType) && treeElement.record.durationForTask(taskType) > 0) {
</del><ins>+ if (!(treeElement.record instanceof WebInspector.RenderingFrameTimelineRecord)) {
+ var taskType = WebInspector.RenderingFrameTimelineRecord.taskTypeForTimelineRecord(treeElement.record);
+ if (!this._renderingFrameTaskFilter.has(taskType))
</ins><span class="cx"> visible = true;
</span><del>- break;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!visible)
</span></span></pre>
</div>
</div>
</body>
</html>