<!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>[186536] 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/186536">186536</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 16:44:40 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Can't select last row in the timeline because it's covered by filter selector
https://bugs.webkit.org/show_bug.cgi?id=146603
Reviewed by Timothy Hatcher.
* UserInterface/Views/ScopeBar.js: Now adds a class to the scope bar if the default item is selected.
* UserInterface/Views/LayoutTimelineView.js:
* UserInterface/Views/NetworkTimelineView.js:
* UserInterface/Views/TimelineDataGrid.css:
(.data-grid.timeline > .navigation-bar-container): Deleted.
(.data-grid.timeline.has-non-default-filter > .navigation-bar-container): Deleted.
(.data-grid.timeline:hover > .navigation-bar-container): Deleted.
(.data-grid.timeline > .navigation-bar-container > .navigation-bar): Deleted.
(body.window-inactive .data-grid.timeline > .navigation-bar-container > .navigation-bar): Deleted.
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid):
(WebInspector.TimelineDataGrid.createColumnScopeBar):
(WebInspector.TimelineDataGrid.prototype.updateLayout): Deleted.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
* UserInterface/Views/TimelineSidebarPanel.css:
(.sidebar > .panel.navigation.timeline > .title-bar.timeline-events):
(.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar):
(.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple):
(.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple path):
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.set contentTreeOutlineScopeBar):
Clears the title bar scope element and adds the given element as a child node.
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.get navigationSidebarTreeOutlineScopeBar):
Returns the scope bar element of the current object if it exists.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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="#trunkSourceWebInspectorUIUserInterfaceViewsScopeBarjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-07-08 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Can't select last row in the timeline because it's covered by filter selector
+ https://bugs.webkit.org/show_bug.cgi?id=146603
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ScopeBar.js: Now adds a class to the scope bar if the default item is selected.
+ * UserInterface/Views/LayoutTimelineView.js:
+ * UserInterface/Views/NetworkTimelineView.js:
+ * UserInterface/Views/TimelineDataGrid.css:
+ (.data-grid.timeline > .navigation-bar-container): Deleted.
+ (.data-grid.timeline.has-non-default-filter > .navigation-bar-container): Deleted.
+ (.data-grid.timeline:hover > .navigation-bar-container): Deleted.
+ (.data-grid.timeline > .navigation-bar-container > .navigation-bar): Deleted.
+ (body.window-inactive .data-grid.timeline > .navigation-bar-container > .navigation-bar): Deleted.
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid):
+ (WebInspector.TimelineDataGrid.createColumnScopeBar):
+ (WebInspector.TimelineDataGrid.prototype.updateLayout): Deleted.
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple path):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.set contentTreeOutlineScopeBar):
+ Clears the title bar scope element and adds the given element as a child node.
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.get navigationSidebarTreeOutlineScopeBar):
+ Returns the scope bar element of the current object if it exists.
+
+2015-07-08 Devin Rousso <drousso@apple.com>
+
</ins><span class="cx"> Web Inspector: Clicking style checkbox selects the property name while mouse down
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146728
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> columns.eventType.scopeBar = WebInspector.TimelineDataGrid.createColumnScopeBar("layout", typeToLabelMap);
</span><span class="cx"> columns.eventType.hidden = true;
</span><ins>+ this._scopeBar = columns.eventType.scopeBar;
</ins><span class="cx">
</span><span class="cx"> columns.location.title = WebInspector.UIString("Initiator");
</span><span class="cx"> columns.location.width = "25%";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> columns.type.scopeBar = WebInspector.TimelineDataGrid.createColumnScopeBar("network", typeToLabelMap);
</span><ins>+ this._scopeBar = columns.type.scopeBar;
</ins><span class="cx">
</span><span class="cx"> columns.method.title = WebInspector.UIString("Method");
</span><span class="cx"> columns.method.width = "6%";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeBarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -102,6 +102,8 @@
</span><span class="cx">
</span><span class="cx"> if (!this.selectedItems.length && this._defaultItem)
</span><span class="cx"> this._defaultItem.selected = true;
</span><ins>+
+ this._element.classList.toggle("default-item-selected", this._defaultItem.selected);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _itemSelectionDidChange(event)
</span><span class="lines">@@ -131,6 +133,7 @@
</span><span class="cx"> if (!this.selectedItems.length && this._defaultItem)
</span><span class="cx"> this._defaultItem.selected = true;
</span><span class="cx">
</span><ins>+ this._element.classList.toggle("default-item-selected", this._defaultItem.selected);
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.ScopeBar.Event.SelectionChanged);
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -31,45 +31,6 @@
</span><span class="cx"> border-top-color: rgb(219, 219, 219);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid.timeline > .navigation-bar-container {
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
- height: 32px;
-
- z-index: 10;
- pointer-events: none;
- visibility: hidden;
-}
-
-.data-grid.timeline.has-non-default-filter > .navigation-bar-container {
- visibility: visible;
-}
-
-.data-grid.timeline:hover > .navigation-bar-container {
- pointer-events: all;
- visibility: visible;
-}
-
-.data-grid.timeline > .navigation-bar-container > .navigation-bar {
- position: absolute;
- top: 4px;
- left: 0;
- right: 0;
- height: 28px;
-
- border-bottom: none;
- border-top: 1px solid rgb(179, 179, 179);
- box-shadow: none;
-
- background-color: white;
-}
-
-body.window-inactive .data-grid.timeline > .navigation-bar-container > .navigation-bar {
- border-top-color: rgb(219, 219, 219);
-}
-
</del><span class="cx"> .timeline-data-grid-tree-outline {
</span><span class="cx"> position: relative;
</span><span class="cx"> padding: 0;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -36,8 +36,10 @@
</span><span class="cx"> // Check if any of the cells can be filtered.
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><span class="cx"> var scopeBar = column.scopeBar;
</span><ins>+
</ins><span class="cx"> if (!scopeBar)
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> this._filterableColumns.push(identifier);
</span><span class="cx"> scopeBar.columnIdentifier = identifier;
</span><span class="cx"> scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectedItemsDidChange, this);
</span><span class="lines">@@ -48,16 +50,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (this._filterableColumns.length) {
- var items = [new WebInspector.FlexibleSpaceNavigationItem, this.columns.get(this._filterableColumns[0]).scopeBar, new WebInspector.FlexibleSpaceNavigationItem];
- this._navigationBar = new WebInspector.NavigationBar(null, items);
- var container = this.element.appendChild(document.createElement("div"));
- container.className = "navigation-bar-container";
- container.appendChild(this._navigationBar.element);
-
- this._updateScopeBarForcedVisibility();
- }
-
</del><span class="cx"> this.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridSelectedNodeChanged, this);
</span><span class="cx"> this.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sort, this);
</span><span class="cx">
</span><span class="lines">@@ -85,9 +77,10 @@
</span><span class="cx"> scopeBarItems.push(item);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- scopeBarItems.unshift(new WebInspector.ScopeBarItem(prefix + "type-all", WebInspector.UIString("All"), true));
</del><ins>+ var allItem = new WebInspector.ScopeBarItem(prefix + "type-all", WebInspector.UIString("All"));
+ scopeBarItems.unshift(allItem);
</ins><span class="cx">
</span><del>- return new WebInspector.ScopeBar(prefix + "scope-bar", scopeBarItems, scopeBarItems[0]);
</del><ins>+ return new WebInspector.ScopeBar(prefix + "scope-bar", scopeBarItems, allItem, true);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineDataGrid.prototype = {
</span><span class="lines">@@ -138,14 +131,6 @@
</span><span class="cx"> return null;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateLayout: function()
- {
- WebInspector.DataGrid.prototype.updateLayout.call(this);
-
- if (this._navigationBar)
- this._navigationBar.updateLayout();
- },
-
</del><span class="cx"> treeElementMatchesActiveScopeFilters: function(treeElement)
</span><span class="cx"> {
</span><span class="cx"> var dataGridNode = this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(treeElement);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -332,6 +332,7 @@
</span><span class="cx"> if (timelineView) {
</span><span class="cx"> this._timelineSidebarPanel.contentTreeOutline = timelineView.navigationSidebarTreeOutline;
</span><span class="cx"> this._timelineSidebarPanel.contentTreeOutlineLabel = timelineView.navigationSidebarTreeOutlineLabel;
</span><ins>+ this._timelineSidebarPanel.contentTreeOutlineScopeBar = timelineView.navigationSidebarTreeOutlineScopeBar;
</ins><span class="cx">
</span><span class="cx"> if (timelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame)
</span><span class="cx"> newTimelineOverview = this._renderingFrameTimelineOverview;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -136,11 +136,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
</span><ins>+ display: flex;
</ins><span class="cx"> height: 23px;
</span><span class="cx"> border-top: 1px solid rgb(179, 179, 179);
</span><span class="cx"> top: 166px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar {
+ position: absolute;
+ top: 2px;
+ right: 0;
+ font-weight: normal;
+}
+
+.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple {
+ background-color: transparent;
+ color: black;
+}
+
+.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple svg .filled {
+ fill: black !important;
+}
+
+.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar > .default-item-selected > .multiple svg .stroked {
+ stroke: black !important;
+}
+
</ins><span class="cx"> body.window-inactive .sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
</span><span class="cx"> border-top-color: rgb(219, 219, 219);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -31,12 +31,20 @@
</span><span class="cx">
</span><span class="cx"> this.contentBrowser = contentBrowser;
</span><span class="cx">
</span><ins>+ var timelineEventsTitleBarContainer = document.createElement("div");
+ timelineEventsTitleBarContainer.classList.add(WebInspector.TimelineSidebarPanel.TitleBarStyleClass);
+ timelineEventsTitleBarContainer.classList.add(WebInspector.TimelineSidebarPanel.TimelineEventsTitleBarStyleClass);
+
</ins><span class="cx"> this._timelineEventsTitleBarElement = document.createElement("div");
</span><del>- this._timelineEventsTitleBarElement.classList.add(WebInspector.TimelineSidebarPanel.TitleBarStyleClass);
- this._timelineEventsTitleBarElement.classList.add(WebInspector.TimelineSidebarPanel.TimelineEventsTitleBarStyleClass);
</del><ins>+ this._timelineEventsTitleBarElement.classList.add(WebInspector.TimelineSidebarPanel.TitleBarTextStyleClass);
+ timelineEventsTitleBarContainer.appendChild(this._timelineEventsTitleBarElement);
</ins><span class="cx">
</span><del>- this.element.insertBefore(this._timelineEventsTitleBarElement, this.element.firstChild);
</del><ins>+ this._timelineEventsTitleBarScopeContainer = document.createElement("div");
+ this._timelineEventsTitleBarScopeContainer.classList.add(WebInspector.TimelineSidebarPanel.TitleBarScopeBarStyleClass);
+ timelineEventsTitleBarContainer.appendChild(this._timelineEventsTitleBarScopeContainer);
</ins><span class="cx">
</span><ins>+ this.element.insertBefore(timelineEventsTitleBarContainer, this.element.firstChild);
+
</ins><span class="cx"> this.contentTreeOutlineLabel = "";
</span><span class="cx">
</span><span class="cx"> this._timelinesContentContainerElement = document.createElement("div");
</span><span class="lines">@@ -299,6 +307,21 @@
</span><span class="cx"> this.filterBar.placeholder = WebInspector.UIString("Filter %s").format(label);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get contentTreeOutlineScopeBar()
+ {
+ return this._timelineEventsTitleBarScopeContainer.children;
+ }
+
+ set contentTreeOutlineScopeBar(scopeBar)
+ {
+ this._timelineEventsTitleBarScopeContainer.removeChildren();
+
+ if (!scopeBar || !scopeBar.element)
+ return;
+
+ this._timelineEventsTitleBarScopeContainer.appendChild(scopeBar.element);
+ }
+
</ins><span class="cx"> showTimelineOverview()
</span><span class="cx"> {
</span><span class="cx"> if (this._timelinesTreeOutline.selectedTreeElement)
</span><span class="lines">@@ -941,6 +964,8 @@
</span><span class="cx"> WebInspector.TimelineSidebarPanel.RecordGlyphRecordingForcedStyleClass = "forced";
</span><span class="cx"> WebInspector.TimelineSidebarPanel.RecordStatusStyleClass = "record-status";
</span><span class="cx"> WebInspector.TimelineSidebarPanel.TitleBarStyleClass = "title-bar";
</span><ins>+WebInspector.TimelineSidebarPanel.TitleBarTextStyleClass = "title-bar-text";
+WebInspector.TimelineSidebarPanel.TitleBarScopeBarStyleClass = "title-bar-scope-bar";
</ins><span class="cx"> WebInspector.TimelineSidebarPanel.TimelinesTitleBarStyleClass = "timelines";
</span><span class="cx"> WebInspector.TimelineSidebarPanel.TimelineEventsTitleBarStyleClass = "timeline-events";
</span><span class="cx"> WebInspector.TimelineSidebarPanel.TimelinesContentContainerStyleClass = "timelines-content";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (186535 => 186536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-07-08 23:43:09 UTC (rev 186535)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-07-08 23:44:40 UTC (rev 186536)
</span><span class="lines">@@ -66,6 +66,11 @@
</span><span class="cx"> return null;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get navigationSidebarTreeOutlineScopeBar()
+ {
+ return this._scopeBar;
+ },
+
</ins><span class="cx"> get timelineSidebarPanel()
</span><span class="cx"> {
</span><span class="cx"> return this._timelineSidebarPanel;
</span></span></pre>
</div>
</div>
</body>
</html>