<!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>[193152] 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/193152">193152</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:51:44 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188708">r188708</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="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMIMETypeUtilitiesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewGraphjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramecss">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.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 (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188708. rdar://problem/23221163
+
+ 2015-08-20 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Filtered frames should be styled differently in the Rendering Frames overview graph
+ https://bugs.webkit.org/show_bug.cgi?id=147421
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.representedObjectWasFiltered):
+ (WebInspector.NavigationSidebarPanel.prototype._updateFilter):
+ Inform derived sidebar of tree element filter state changes.
+
+ * UserInterface/Views/RenderingFrameTimelineOverviewGraph.js:
+ (WebInspector.RenderingFrameTimelineOverviewGraph.prototype.recordWasFiltered):
+ (WebInspector.RenderingFrameTimelineOverviewGraph.prototype.updateLayout):
+ Update filtered frame style when a record's state changes, and during layout.
+
+ * UserInterface/Views/TimelineOverview.js:
+ * UserInterface/Views/TimelineOverviewGraph.js:
+ (WebInspector.TimelineOverviewGraph.prototype.recordWasFiltered):
+ Allow setting a record's filtered state for a given timeline in the overview.
+
+ * UserInterface/Views/TimelineRecordFrame.css:
+ (.timeline-record-frame.filtered > .frame):
+ New filtered frame style.
+
+ * UserInterface/Views/TimelineRecordFrame.js:
+ (WebInspector.TimelineRecordFrame.prototype.get filtered):
+ (WebInspector.TimelineRecordFrame.prototype.set filtered):
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype.recordWasFiltered):
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.representedObjectWasFiltered):
+ (WebInspector.TimelineSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+ Apply task filters to RenderingFrameTimelineRecords and their immediate children.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188691. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-20 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseImageUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> canvasIdentifierPrefix = canvasIdentifierPrefix || "";
</span><span class="cx">
</span><del>- const storageKeyPrefix = "generated-colored-image-";
</del><ins>+ var storageKeyPrefix = "generated-colored-image-";
</ins><span class="cx">
</span><span class="cx"> var imageElement = null;
</span><span class="cx"> var pendingImageLoadCallbacks = [];
</span><span class="lines">@@ -340,8 +340,8 @@
</span><span class="cx">
</span><span class="cx"> function restoreImage(canvasIdentifier, specification)
</span><span class="cx"> {
</span><del>- const storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
- const context = document.getCSSCanvasContext("2d", canvasIdentifierPrefix + canvasIdentifier, scaledWidth, scaledHeight);
</del><ins>+ var storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
+ var context = document.getCSSCanvasContext("2d", canvasIdentifierPrefix + canvasIdentifier, scaledWidth, scaledHeight);
</ins><span class="cx"> restoreImageFromStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || defaultImageVersion, function() {
</span><span class="cx"> ensureImageIsLoaded(generateImage.bind(null, canvasIdentifier, specification));
</span><span class="cx"> });
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> console.assert(specification.fillColor instanceof Array);
</span><span class="cx"> console.assert(specification.fillColor.length === 3 || specification.fillColor.length === 4);
</span><span class="cx">
</span><del>- const context = document.getCSSCanvasContext("2d", canvasIdentifierPrefix + canvasIdentifier, scaledWidth, scaledHeight);
</del><ins>+ var context = document.getCSSCanvasContext("2d", canvasIdentifierPrefix + canvasIdentifier, scaledWidth, scaledHeight);
</ins><span class="cx"> context.save();
</span><span class="cx"> context.scale(scaleFactor, scaleFactor);
</span><span class="cx">
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> var coloredImage = generateColoredImage(imageElement, specification.fillColor[0], specification.fillColor[1], specification.fillColor[2], specification.fillColor[3], scaledWidth, scaledHeight);
</span><span class="cx"> context.drawImage(coloredImage, 0, 0, width, height);
</span><span class="cx">
</span><del>- const storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
</del><ins>+ var storageKey = storageKeyPrefix + canvasIdentifierPrefix + canvasIdentifier;
</ins><span class="cx"> saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, specification.imageVersion || defaultImageVersion);
</span><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="lines">@@ -398,9 +398,9 @@
</span><span class="cx"> var scaledWidth = width * scaleFactor;
</span><span class="cx"> var scaledHeight = height * scaleFactor;
</span><span class="cx">
</span><del>- const imageVersion = defaultImageVersion;
</del><ins>+ var imageVersion = defaultImageVersion;
</ins><span class="cx">
</span><del>- const storageKeyPrefix = "generated-embossed-image-";
</del><ins>+ var storageKeyPrefix = "generated-embossed-image-";
</ins><span class="cx">
</span><span class="cx"> var image = null;
</span><span class="cx"> var pendingImageLoadCallbacks = [];
</span><span class="lines">@@ -455,8 +455,8 @@
</span><span class="cx">
</span><span class="cx"> function restoreImage(state)
</span><span class="cx"> {
</span><del>- const storageKey = storageKeyPrefix + canvasIdentifierCallback(state);
- const context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight);
</del><ins>+ var storageKey = storageKeyPrefix + canvasIdentifierCallback(state);
+ var context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight);
</ins><span class="cx"> restoreImageFromStorage(storageKey, context, scaledWidth, scaledHeight, imageVersion, function() {
</span><span class="cx"> ensureImageIsLoaded(generateImage.bind(null, state));
</span><span class="cx"> });
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx">
</span><span class="cx"> function generateImage(state)
</span><span class="cx"> {
</span><del>- const context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight);
</del><ins>+ var context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight);
</ins><span class="cx"> context.save();
</span><span class="cx"> context.scale(scaleFactor, scaleFactor);
</span><span class="cx">
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> _applyImageMask(context, image);
</span><span class="cx">
</span><span class="cx"> if (!ignoreCache) {
</span><del>- const storageKey = storageKeyPrefix + canvasIdentifierCallback(state);
</del><ins>+ var storageKey = storageKeyPrefix + canvasIdentifierCallback(state);
</ins><span class="cx"> saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, imageVersion);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMIMETypeUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.mimeTypeForFileExtension = function(extension)
</span><span class="cx"> {
</span><del>- const extensionToMIMEType = {
</del><ins>+ var extensionToMIMEType = {
</ins><span class="cx"> // Document types.
</span><span class="cx"> "html": "text/html",
</span><span class="cx"> "xhtml": "application/xhtml+xml",
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -1361,8 +1361,8 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._updateSplitConsoleHeight = function(height)
</span><span class="cx"> {
</span><del>- const minimumHeight = 64;
- const maximumHeight = window.innerHeight * 0.55;
</del><ins>+ var minimumHeight = 64;
+ var maximumHeight = window.innerHeight * 0.55;
</ins><span class="cx">
</span><span class="cx"> height = Math.max(minimumHeight, Math.min(height, maximumHeight));
</span><span class="cx">
</span><span class="lines">@@ -1503,7 +1503,7 @@
</span><span class="cx">
</span><span class="cx"> // Ignore dragging on the top of the toolbar on Mac if the system handles it.
</span><span class="cx"> if (WebInspector.Platform.version.release === 10) {
</span><del>- const windowDragHandledTitleBarHeight = 22;
</del><ins>+ var windowDragHandledTitleBarHeight = 22;
</ins><span class="cx"> if (event.pageY < windowDragHandledTitleBarHeight) {
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> // Matches the wtf/StringHasher.h (SuperFastHash) algorithm.
</span><span class="cx">
</span><span class="cx"> // Arbitrary start value to avoid mapping all 0's to all 0's.
</span><del>- const stringHashingStartValue = 0x9e3779b9;
</del><ins>+ var stringHashingStartValue = 0x9e3779b9;
</ins><span class="cx">
</span><span class="cx"> var result = stringHashingStartValue;
</span><span class="cx"> var pendingCharacter = null;
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx"> {
</span><span class="cx"> mimeType = mimeType || '';
</span><span class="cx">
</span><del>- const sliceSize = 1024;
</del><ins>+ var sliceSize = 1024;
</ins><span class="cx"> var byteCharacters = atob(base64Data);
</span><span class="cx"> var bytesLength = byteCharacters.length;
</span><span class="cx"> var slicesCount = Math.ceil(bytesLength / sliceSize);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (callFrame) {
</span><del>- const showFunctionName = !!callFrame.functionName;
</del><ins>+ var showFunctionName = !!callFrame.functionName;
</ins><span class="cx"> var locationElement = new WebInspector.CallFrameView(callFrame, showFunctionName);
</span><span class="cx"> locationElement.classList.add("console-message-location");
</span><span class="cx"> this._element.appendChild(locationElement);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> var provisionalEntry = new WebInspector.BackForwardEntry(contentView, cookie);
</span><span class="cx"> // Don't do anything if we would have added an identical back/forward list entry.
</span><span class="cx"> if (currentEntry && currentEntry.contentView === contentView && Object.shallowEqual(provisionalEntry.cookie, currentEntry.cookie)) {
</span><del>- const shouldCallShown = false;
</del><ins>+ var shouldCallShown = false;
</ins><span class="cx"> currentEntry.prepareToShow(shouldCallShown);
</span><span class="cx"> return currentEntry.contentView;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> this._dataGrid.removeChildren();
</span><span class="cx">
</span><span class="cx"> for (var cookie of this._cookies) {
</span><del>- const checkmark = "\u2713";
</del><ins>+ var checkmark = "\u2713";
</ins><span class="cx"> var data = {
</span><span class="cx"> "name": cookie.name,
</span><span class="cx"> "value": cookie.value,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx">
</span><del>- const uniqueFontName = "WebInspectorFontPreview" + (++WebInspector.FontResourceContentView._uniqueFontIdentifier);
</del><ins>+ var uniqueFontName = "WebInspectorFontPreview" + (++WebInspector.FontResourceContentView._uniqueFontIdentifier);
</ins><span class="cx">
</span><span class="cx"> var format = "";
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGridNode.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier, cell)
</span><span class="cx"> {
</span><del>- const emptyValuePlaceholderString = "\u2014";
</del><ins>+ var emptyValuePlaceholderString = "\u2014";
</ins><span class="cx"> var value = this.data[columnIdentifier];
</span><span class="cx">
</span><span class="cx"> switch (columnIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -265,8 +265,8 @@
</span><span class="cx">
</span><span class="cx"> this._showingHighlightForRecord = record;
</span><span class="cx">
</span><del>- const contentColor = {r: 111, g: 168, b: 220, a: 0.66};
- const outlineColor = {r: 255, g: 229, b: 153, a: 0.66};
</del><ins>+ var contentColor = {r: 111, g: 168, b: 220, a: 0.66};
+ var outlineColor = {r: 255, g: 229, b: 153, a: 0.66};
</ins><span class="cx">
</span><span class="cx"> var quad = record.quad;
</span><span class="cx"> if (quad && DOMAgent.highlightQuad) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx">
</span><span class="cx"> _keyPress(event)
</span><span class="cx"> {
</span><del>- const isCommandC = event.metaKey && event.keyCode === 99;
</del><ins>+ var isCommandC = event.metaKey && event.keyCode === 99;
</ins><span class="cx"> if (!isCommandC)
</span><span class="cx"> this.prompt.focus();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -427,6 +427,11 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ representedObjectWasFiltered(representedObject, filtered)
+ {
+ // Implemented by subclasses if needed.
+ }
+
</ins><span class="cx"> pruneStaleResourceTreeElements()
</span><span class="cx"> {
</span><span class="cx"> if (this._checkForStaleResourcesTimeoutIdentifier) {
</span><span class="lines">@@ -531,7 +536,11 @@
</span><span class="cx"> // Update the whole tree.
</span><span class="cx"> var currentTreeElement = this._contentTreeOutline.children[0];
</span><span class="cx"> while (currentTreeElement && !currentTreeElement.root) {
</span><ins>+ var currentTreeElementWasHidden = currentTreeElement.hidden;
</ins><span class="cx"> this.applyFiltersToTreeElement(currentTreeElement);
</span><ins>+ if (currentTreeElementWasHidden !== currentTreeElement.hidden)
+ this.representedObjectWasFiltered(currentTreeElement.representedObject, currentTreeElement.hidden);
+
</ins><span class="cx"> currentTreeElement = currentTreeElement.traverseNextTreeElement(false, null, dontPopulate);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProfileNodeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProfileNodeDataGridNode.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier, cell)
</span><span class="cx"> {
</span><del>- const emptyValuePlaceholderString = "\u2014";
</del><ins>+ var emptyValuePlaceholderString = "\u2014";
</ins><span class="cx"> var value = this.data[columnIdentifier];
</span><span class="cx">
</span><span class="cx"> switch (columnIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineDataGridNode.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineDataGridNode.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineDataGridNode.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier, cell)
</span><span class="cx"> {
</span><del>- const emptyValuePlaceholderString = "\u2014";
</del><ins>+ var emptyValuePlaceholderString = "\u2014";
</ins><span class="cx"> var value = this.data[columnIdentifier];
</span><span class="cx">
</span><span class="cx"> switch (columnIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -74,6 +74,25 @@
</span><span class="cx"> this._framesPerSecondDividerMap.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ recordWasFiltered(record, filtered)
+ {
+ super.recordWasFiltered(record, filtered);
+
+ if (!(record instanceof WebInspector.RenderingFrameTimelineRecord))
+ return;
+
+ record[WebInspector.RenderingFrameTimelineOverviewGraph.RecordWasFilteredSymbol] = filtered;
+
+ // Set filtered style if the frame element is within the visible range.
+ var startIndex = Math.floor(this.startTime);
+ var endIndex = Math.min(Math.floor(this.endTime), this._renderingFrameTimeline.records.length - 1);
+ if (record.frameIndex < startIndex || record.frameIndex > endIndex)
+ return;
+
+ var frameIndex = record.frameIndex - startIndex;
+ this._timelineRecordFrames[frameIndex].filtered = filtered;
+ }
+
</ins><span class="cx"> updateLayout()
</span><span class="cx"> {
</span><span class="cx"> super.updateLayout();
</span><span class="lines">@@ -98,6 +117,7 @@
</span><span class="cx"> if (!timelineRecordFrame.element.parentNode)
</span><span class="cx"> this.element.appendChild(timelineRecordFrame.element);
</span><span class="cx">
</span><ins>+ timelineRecordFrame.filtered = record[WebInspector.RenderingFrameTimelineOverviewGraph.RecordWasFilteredSymbol] || false;
</ins><span class="cx"> ++recordFrameIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -120,8 +140,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const visibleDuration = this.timelineOverview.visibleDuration;
- const frameIndex = this.selectedRecord.frameIndex;
</del><ins>+ var visibleDuration = this.timelineOverview.visibleDuration;
+ var frameIndex = this.selectedRecord.frameIndex;
</ins><span class="cx">
</span><span class="cx"> // Reveal a newly selected record if it's outside the visible range.
</span><span class="cx"> if (frameIndex < Math.ceil(this.timelineOverview.scrollStartTime) || frameIndex >= this.timelineOverview.scrollStartTime + visibleDuration) {
</span><span class="lines">@@ -246,5 +266,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.RenderingFrameTimelineOverviewGraph.RecordWasFilteredSymbol = Symbol("rendering-frame-overview-graph-record-was-filtered");
+
</ins><span class="cx"> WebInspector.RenderingFrameTimelineOverviewGraph.MaximumGraphHeightSeconds = 0.037;
</span><span class="cx"> WebInspector.RenderingFrameTimelineOverviewGraph.MinimumGraphHeightSeconds = 0.0185;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> if (resource.failed || resource.canceled || resource.statusCode >= 400)
</span><span class="cx"> cell.classList.add("error");
</span><span class="cx">
</span><del>- const emptyValuePlaceholderString = "\u2014";
</del><ins>+ var emptyValuePlaceholderString = "\u2014";
</ins><span class="cx"> var value = this.data[columnIdentifier];
</span><span class="cx">
</span><span class="cx"> switch (columnIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> objectTree.showOnlyProperties();
</span><span class="cx">
</span><span class="cx"> var treeOutline = objectTree.treeOutline;
</span><del>- const watchExpressionSectionIdentifier = "watch-expressions";
</del><ins>+ var watchExpressionSectionIdentifier = "watch-expressions";
</ins><span class="cx"> treeOutline.onadd = this._objectTreeAddHandler.bind(this, watchExpressionSectionIdentifier);
</span><span class="cx"> treeOutline.onexpand = this._objectTreeExpandHandler.bind(this, watchExpressionSectionIdentifier);
</span><span class="cx"> treeOutline.oncollapse = this._objectTreeCollapseHandler.bind(this, watchExpressionSectionIdentifier);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier, cell)
</span><span class="cx"> {
</span><del>- const emptyValuePlaceholderString = "\u2014";
</del><ins>+ var emptyValuePlaceholderString = "\u2014";
</ins><span class="cx"> var value = this.data[columnIdentifier];
</span><span class="cx">
</span><span class="cx"> switch (columnIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -279,6 +279,18 @@
</span><span class="cx"> this.scrollStartTime = marker.time - (this.visibleDuration / 2);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ recordWasFiltered(timeline, record, filtered)
+ {
+ console.assert(this.canShowTimeline(timeline), timeline);
+
+ var overviewGraph = this._timelineOverviewGraphsMap.get(timeline);
+ console.assert(overviewGraph, "Missing overview graph for timeline type " + timeline.type);
+ if (!overviewGraph)
+ return;
+
+ overviewGraph.recordWasFiltered(record, filtered);
+ }
+
</ins><span class="cx"> selectRecord(timeline, record)
</span><span class="cx"> {
</span><span class="cx"> console.assert(this.canShowTimeline(timeline), timeline);
</span><span class="lines">@@ -318,7 +330,7 @@
</span><span class="cx"> this._revealCurrentTime = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const visibleDuration = this.visibleDuration;
</del><ins>+ var visibleDuration = this.visibleDuration;
</ins><span class="cx">
</span><span class="cx"> // Clamp the scroll start time to match what the scroll bar would allow.
</span><span class="cx"> var scrollStartTime = Math.min(this._scrollStartTime, this._endTime - visibleDuration);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineOverviewGraphjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -171,6 +171,11 @@
</span><span class="cx"> // Implemented by sub-classes if needed.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ recordWasFiltered(record, filtered)
+ {
+ // Implemented by sub-classes if needed.
+ }
+
</ins><span class="cx"> updateLayout()
</span><span class="cx"> {
</span><span class="cx"> if (this._scheduledLayoutUpdateIdentifier) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramecss"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx"> background: -webkit-linear-gradient(left, hsl(0, 0%, 96%), hsl(0, 0%, 96%)) no-repeat 1px -1px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.timeline-record-frame.filtered > .frame {
+ opacity: 0.35;
+}
+
</ins><span class="cx"> .timeline-record-frame.selected > .frame {
</span><span class="cx"> box-shadow: 0 -1px 0 white;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordFramejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> this._graphDataSource = graphDataSource;
</span><span class="cx"> this._record = record || null;
</span><ins>+ this._filtered = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -66,6 +67,20 @@
</span><span class="cx"> this._element.classList.toggle("selected");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get filtered()
+ {
+ return this._filtered;
+ }
+
+ set filtered(x)
+ {
+ if (this._filtered === x)
+ return;
+
+ this._filtered = x;
+ this._element.classList.toggle("filtered");
+ }
+
</ins><span class="cx"> refresh(graphDataSource)
</span><span class="cx"> {
</span><span class="cx"> if (!this._record)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -247,6 +247,14 @@
</span><span class="cx"> this.currentTimelineView.filterDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ recordWasFiltered(record, filtered)
+ {
+ if (!this.currentTimelineView)
+ return;
+
+ this._currentTimelineOverview.recordWasFiltered(this.currentTimelineView.representedObject, record, filtered);
+ }
+
</ins><span class="cx"> matchTreeElementAgainstCustomFilters(treeElement)
</span><span class="cx"> {
</span><span class="cx"> if (this.currentTimelineView && !this.currentTimelineView.matchTreeElementAgainstCustomFilters(treeElement))
</span><span class="lines">@@ -546,9 +554,9 @@
</span><span class="cx">
</span><span class="cx"> _updateTimelineOverviewHeight()
</span><span class="cx"> {
</span><del>- const timelineHeight = 36;
- const renderingFramesTimelineHeight = 108;
- const rulerHeight = 29;
</del><ins>+ var timelineHeight = 36;
+ var renderingFramesTimelineHeight = 108;
+ var rulerHeight = 29;
</ins><span class="cx">
</span><span class="cx"> var overviewHeight;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -377,6 +377,14 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ representedObjectWasFiltered(representedObject, filtered)
+ {
+ super.representedObjectWasFiltered(representedObject, filtered);
+
+ if (representedObject instanceof WebInspector.TimelineRecord)
+ this._displayedContentView.recordWasFiltered(representedObject, filtered);
+ }
+
</ins><span class="cx"> updateFilter()
</span><span class="cx"> {
</span><span class="cx"> super.updateFilter();
</span><span class="lines">@@ -407,14 +415,18 @@
</span><span class="cx"> if (!treeElement)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- var visible = false;
- if (!(treeElement.record instanceof WebInspector.RenderingFrameTimelineRecord)) {
- var taskType = WebInspector.RenderingFrameTimelineRecord.taskTypeForTimelineRecord(treeElement.record);
- if (!this._renderingFrameTaskFilter.has(taskType))
- visible = true;
- }
</del><ins>+ var records;
+ if (treeElement.record instanceof WebInspector.RenderingFrameTimelineRecord)
+ records = treeElement.record.children;
+ else
+ records = [treeElement.record];
</ins><span class="cx">
</span><del>- if (!visible)
</del><ins>+ var filtered = records.every(function(record) {
+ var taskType = WebInspector.RenderingFrameTimelineRecord.taskTypeForTimelineRecord(record);
+ return this._renderingFrameTaskFilter.has(taskType);
+ }, this);
+
+ if (filtered)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (193151 => 193152)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-12-03 18:51:31 UTC (rev 193151)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-12-03 18:51:44 UTC (rev 193152)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> function checkIfLayoutIsNeeded(currentTime)
</span><span class="cx"> {
</span><span class="cx"> // Include some wiggle room since the current time markers can be clipped off the ends a bit and still partially visible.
</span><del>- const wiggleTime = 0.05; // 50ms
</del><ins>+ var wiggleTime = 0.05; // 50ms
</ins><span class="cx"> return this._startTime - wiggleTime <= currentTime && currentTime <= this._endTime + wiggleTime;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>