<!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>[197102] releases/WebKitGTK/webkit-2.12/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/197102">197102</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 05:24:28 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Timelines sidebar and overview attempt to access undefined properties when FPS instrument is absent
https://bugs.webkit.org/show_bug.cgi?id=154567
<rdar://problem/24781536>
Reviewed by Joseph Pecoraro.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
The viewMode property should be in a valid state before attempting
to access the current view mode settings.
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype.get minimumWidth):
(WebInspector.TimelineSidebarPanel.prototype._updateViewModeIfNeeded):
(WebInspector.TimelineSidebarPanel):
Added missing checks for FPSInstrument support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog (197101 => 197102)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 13:21:30 UTC (rev 197101)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 13:24:28 UTC (rev 197102)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-02-22 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Timelines sidebar and overview attempt to access undefined properties when FPS instrument is absent
+ https://bugs.webkit.org/show_bug.cgi?id=154567
+ <rdar://problem/24781536>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ The viewMode property should be in a valid state before attempting
+ to access the current view mode settings.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.get minimumWidth):
+ (WebInspector.TimelineSidebarPanel.prototype._updateViewModeIfNeeded):
+ (WebInspector.TimelineSidebarPanel):
+ Added missing checks for FPSInstrument support.
+
</ins><span class="cx"> 2016-02-22 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r196620): Web Inspector: Filter bar in the left sidebar is 1px shorter than the console prompt
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (197101 => 197102)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-02-25 13:21:30 UTC (rev 197101)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-02-25 13:24:28 UTC (rev 197102)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> this._mouseWheelDelta = 0;
</span><span class="cx"> this._cachedScrollContainerWidth = NaN;
</span><span class="cx"> this._timelineRulerSelectionChanged = false;
</span><ins>+ this._viewMode = WebInspector.TimelineOverview.ViewMode.Timelines;
</ins><span class="cx">
</span><span class="cx"> for (let instrument of this._recording.instruments)
</span><span class="cx"> this._instrumentAdded(instrument);
</span><span class="lines">@@ -92,7 +93,7 @@
</span><span class="cx"> if (!WebInspector.timelineManager.isCapturingPageReload())
</span><span class="cx"> this._resetSelection();
</span><span class="cx">
</span><del>- this.viewMode = WebInspector.TimelineOverview.ViewMode.Timelines;
</del><ins>+ this._viewModeDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (197101 => 197102)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-02-25 13:21:30 UTC (rev 197101)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2016-02-25 13:24:28 UTC (rev 197102)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> get minimumWidth()
</span><span class="cx"> {
</span><del>- if (this._viewModeNavigationBar)
</del><ins>+ if (WebInspector.FPSInstrument.supported())
</ins><span class="cx"> return Math.max(this._replayNavigationBar.minimumWidth, this._viewModeNavigationBar.minimumWidth);
</span><span class="cx"> return this._replayNavigationBar.minimumWidth;
</span><span class="cx"> }
</span><span class="lines">@@ -899,6 +899,10 @@
</span><span class="cx">
</span><span class="cx"> _refreshFrameSelectionChart()
</span><span class="cx"> {
</span><ins>+ console.assert(WebInspector.FPSInstrument.supported());
+ if (!WebInspector.FPSInstrument.supported())
+ return;
+
</ins><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1034,15 +1038,13 @@
</span><span class="cx">
</span><span class="cx"> this._viewMode = newViewMode;
</span><span class="cx">
</span><del>- if (this._viewMode === WebInspector.TimelineOverview.ViewMode.Timelines) {
- this._timelinesTreeOutline.hidden = false;
- this._frameSelectionChartSection.collapsed = true;
- } else {
- this._timelinesTreeOutline.hidden = true;
- this._frameSelectionChartSection.collapsed = false;
</del><ins>+ let isShowingTimelines = this._viewMode === WebInspector.TimelineOverview.ViewMode.Timelines;
+ this._timelinesTreeOutline.hidden = !isShowingTimelines;
+
+ if (WebInspector.FPSInstrument.supported()) {
+ this._frameSelectionChartSection.collapsed = isShowingTimelines;
+ this._viewModeNavigationBar.selectedNavigationItem = this._viewMode;
</ins><span class="cx"> }
</span><del>-
- this._viewModeNavigationBar.selectedNavigationItem = this._viewMode;
</del><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>