<!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>[178544] 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/178544">178544</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-15 17:00:23 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: selecting Paint timeline records from sidebar does not trigger preview of paint quad
https://bugs.webkit.org/show_bug.cgi?id=139151
Reviewed by Brian Burg.
* UserInterface/Views/LayoutTimelineDataGrid.js:
(WebInspector.LayoutTimelineDataGrid):
(WebInspector.LayoutTimelineDataGrid.prototype.callFramePopoverAnchorElement):
(WebInspector.LayoutTimelineDataGrid.prototype.reset): Deleted.
(WebInspector.LayoutTimelineDataGrid.prototype.hidden): Deleted.
(WebInspector.LayoutTimelineDataGrid.prototype._layoutDataGridSelectedNodeChanged): Deleted.
(WebInspector.LayoutTimelineDataGrid.prototype._hideHighlightIfNeeded): Deleted.
Move the node highlight from the datagrid to the timeline view because
we want this to happen on both the Navigation sidebar and the datagrid.
* UserInterface/Views/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView.prototype.shown):
(WebInspector.LayoutTimelineView.prototype.hidden):
(WebInspector.LayoutTimelineView.prototype.filterDidChange):
(WebInspector.LayoutTimelineView.prototype.reset):
(WebInspector.LayoutTimelineView.prototype._treeElementDeselected):
(WebInspector.LayoutTimelineView.prototype._treeElementSelected):
Update the highlight for major view updates.
(WebInspector.LayoutTimelineView.prototype._updateHighlight):
(WebInspector.LayoutTimelineView.prototype._showHighlightForRecord):
(WebInspector.LayoutTimelineView.prototype._hideHighlightIfNeeded):
(WebInspector.LayoutTimelineView.prototype._hoveredOrSelectedRecord):
Show a highlight for what we are hovering, or what is selected.
Note the selected node may not be visible due to filtering.
(WebInspector.LayoutTimelineView.prototype._mouseOverDataGrid):
(WebInspector.LayoutTimelineView.prototype._mouseLeaveDataGrid):
(WebInspector.LayoutTimelineView.prototype._mouseOverTreeOutline):
(WebInspector.LayoutTimelineView.prototype._mouseLeaveTreeOutline):
Update hovered information mousing over the datagrid and tree outline.
* UserInterface/Views/TimelineContentView.js:
(WebInspector.TimelineContentView.prototype.filterDidChange):
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype.updateFilter):
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.filterDidChange):
Include a "filterDidChange" TimelineView method that gets called after
updateFilter (things like the filter bar or timeline range changes).
* UserInterface/Views/TreeOutline.js:
(TreeOutline.prototype.treeElementFromNode):
(TreeOutline.prototype.treeElementFromPoint):
Provide a helper to get a tree element from an event target.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-01-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: selecting Paint timeline records from sidebar does not trigger preview of paint quad
+ https://bugs.webkit.org/show_bug.cgi?id=139151
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/LayoutTimelineDataGrid.js:
+ (WebInspector.LayoutTimelineDataGrid):
+ (WebInspector.LayoutTimelineDataGrid.prototype.callFramePopoverAnchorElement):
+ (WebInspector.LayoutTimelineDataGrid.prototype.reset): Deleted.
+ (WebInspector.LayoutTimelineDataGrid.prototype.hidden): Deleted.
+ (WebInspector.LayoutTimelineDataGrid.prototype._layoutDataGridSelectedNodeChanged): Deleted.
+ (WebInspector.LayoutTimelineDataGrid.prototype._hideHighlightIfNeeded): Deleted.
+ Move the node highlight from the datagrid to the timeline view because
+ we want this to happen on both the Navigation sidebar and the datagrid.
+
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WebInspector.LayoutTimelineView.prototype.shown):
+ (WebInspector.LayoutTimelineView.prototype.hidden):
+ (WebInspector.LayoutTimelineView.prototype.filterDidChange):
+ (WebInspector.LayoutTimelineView.prototype.reset):
+ (WebInspector.LayoutTimelineView.prototype._treeElementDeselected):
+ (WebInspector.LayoutTimelineView.prototype._treeElementSelected):
+ Update the highlight for major view updates.
+
+ (WebInspector.LayoutTimelineView.prototype._updateHighlight):
+ (WebInspector.LayoutTimelineView.prototype._showHighlightForRecord):
+ (WebInspector.LayoutTimelineView.prototype._hideHighlightIfNeeded):
+ (WebInspector.LayoutTimelineView.prototype._hoveredOrSelectedRecord):
+ Show a highlight for what we are hovering, or what is selected.
+ Note the selected node may not be visible due to filtering.
+
+ (WebInspector.LayoutTimelineView.prototype._mouseOverDataGrid):
+ (WebInspector.LayoutTimelineView.prototype._mouseLeaveDataGrid):
+ (WebInspector.LayoutTimelineView.prototype._mouseOverTreeOutline):
+ (WebInspector.LayoutTimelineView.prototype._mouseLeaveTreeOutline):
+ Update hovered information mousing over the datagrid and tree outline.
+
+ * UserInterface/Views/TimelineContentView.js:
+ (WebInspector.TimelineContentView.prototype.filterDidChange):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.updateFilter):
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.filterDidChange):
+ Include a "filterDidChange" TimelineView method that gets called after
+ updateFilter (things like the filter bar or timeline range changes).
+
+ * UserInterface/Views/TreeOutline.js:
+ (TreeOutline.prototype.treeElementFromNode):
+ (TreeOutline.prototype.treeElementFromPoint):
+ Provide a helper to get a tree element from an event target.
+
</ins><span class="cx"> 2015-01-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: TextEditor doesn't update when resizing console, white space instead of content
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -26,10 +26,6 @@
</span><span class="cx"> WebInspector.LayoutTimelineDataGrid = function(treeOutline, columns, delegate, editCallback, deleteCallback)
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TimelineDataGrid.call(this, treeOutline, columns, delegate, editCallback, deleteCallback);
</span><del>-
- this._showingHighlight = false;
-
- this.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._layoutDataGridSelectedNodeChanged, this);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.LayoutTimelineDataGrid.prototype = {
</span><span class="lines">@@ -37,60 +33,9 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- reset: function()
- {
- WebInspector.TimelineDataGrid.prototype.reset.call(this);
-
- this._hideHighlightIfNeeded();
- },
-
</del><span class="cx"> callFramePopoverAnchorElement: function()
</span><span class="cx"> {
</span><span class="cx"> return this.selectedNode.elementWithColumnIdentifier("initiatorCallFrame");
</span><del>- },
-
- hidden: function()
- {
- WebInspector.TimelineDataGrid.prototype.hidden.call(this);
-
- this._hideHighlightIfNeeded();
- },
-
- // Private
-
- _layoutDataGridSelectedNodeChanged: function(event)
- {
- if (!this.selectedNode) {
- this._hideHighlightIfNeeded();
- return;
- }
-
- var record = this.selectedNode.record;
- const contentColor = {r: 111, g: 168, b: 220, a: 0.66};
- const outlineColor = {r: 255, g: 229, b: 153, a: 0.66};
-
- var quad = record.quad;
- if (quad && DOMAgent.highlightQuad) {
- DOMAgent.highlightQuad(quad.toProtocol(), contentColor, outlineColor);
- this._showingHighlight = true;
- return;
- }
-
- // COMPATIBILITY (iOS 6): iOS 6 included Rect information instead of Quad information. Fallback to highlighting the rect.
- var rect = record.rect;
- if (rect) {
- DOMAgent.highlightRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height, contentColor, outlineColor);
- this._showingHighlight = true;
- return;
- }
- },
-
- _hideHighlightIfNeeded: function()
- {
- if (this._showingHighlight) {
- DOMAgent.hideHighlight();
- this._showingHighlight = false;
- }
</del><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -75,6 +75,16 @@
</span><span class="cx"> this._dataGrid.sortColumnIdentifier = "startTime";
</span><span class="cx"> this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx">
</span><ins>+ this._hoveredTreeElement = null;
+ this._hoveredDataGridNode = null;
+ this._showingHighlight = false;
+ this._showingHighlightForRecord = null;
+
+ this._dataGrid.element.addEventListener("mouseover", this._mouseOverDataGrid.bind(this));
+ this._dataGrid.element.addEventListener("mouseleave", this._mouseLeaveDataGrid.bind(this));
+ this.navigationSidebarTreeOutline.element.addEventListener("mouseover", this._mouseOverTreeOutline.bind(this));
+ this.navigationSidebarTreeOutline.element.addEventListener("mouseleave", this._mouseLeaveTreeOutline.bind(this));
+
</ins><span class="cx"> this.element.classList.add(WebInspector.LayoutTimelineView.StyleClassName);
</span><span class="cx"> this.element.appendChild(this._dataGrid.element);
</span><span class="cx">
</span><span class="lines">@@ -101,16 +111,27 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TimelineView.prototype.shown.call(this);
</span><span class="cx">
</span><ins>+ this._updateHighlight();
+
</ins><span class="cx"> this._dataGrid.shown();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hidden: function()
</span><span class="cx"> {
</span><ins>+ this._hideHighlightIfNeeded();
+
</ins><span class="cx"> this._dataGrid.hidden();
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineView.prototype.hidden.call(this);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ filterDidChange: function()
+ {
+ WebInspector.TimelineView.prototype.filterDidChange.call(this);
+
+ this._updateHighlight();
+ },
+
</ins><span class="cx"> updateLayout: function()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TimelineView.prototype.updateLayout.call(this);
</span><span class="lines">@@ -129,6 +150,8 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.TimelineView.prototype.reset.call(this);
</span><span class="cx">
</span><ins>+ this._hideHighlightIfNeeded();
+
</ins><span class="cx"> this._dataGrid.reset();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -183,6 +206,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (treeElement.status)
</span><span class="cx"> treeElement.status = "";
</span><ins>+
+ this._updateHighlight();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _treeElementSelected: function(treeElement, selectedByUser)
</span><span class="lines">@@ -201,6 +226,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this._updateHighlight();
+
</ins><span class="cx"> if (!treeElement.record.sourceCodeLocation) {
</span><span class="cx"> WebInspector.timelineSidebarPanel.showTimelineViewForType(WebInspector.TimelineRecord.Type.Layout);
</span><span class="cx"> return;
</span><span class="lines">@@ -229,5 +256,107 @@
</span><span class="cx"> {
</span><span class="cx"> this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</span><span class="cx"> WebInspector.timelineSidebarPanel.showTimelineViewForType(WebInspector.TimelineRecord.Type.Layout);
</span><ins>+ },
+
+ _updateHighlight: function()
+ {
+ var record = this._hoveredOrSelectedRecord();
+ if (!record) {
+ this._hideHighlightIfNeeded();
+ return;
+ }
+
+ this._showHighlightForRecord(record);
+ },
+
+ _showHighlightForRecord: function(record)
+ {
+ if (this._showingHighlightForRecord === record)
+ return;
+
+ this._showingHighlightForRecord = record;
+
+ const contentColor = {r: 111, g: 168, b: 220, a: 0.66};
+ const outlineColor = {r: 255, g: 229, b: 153, a: 0.66};
+
+ var quad = record.quad;
+ if (quad && DOMAgent.highlightQuad) {
+ DOMAgent.highlightQuad(quad.toProtocol(), contentColor, outlineColor);
+ this._showingHighlight = true;
+ return;
+ }
+
+ // COMPATIBILITY (iOS 6): iOS 6 included Rect information instead of Quad information. Fallback to highlighting the rect.
+ var rect = record.rect;
+ if (rect) {
+ DOMAgent.highlightRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height, contentColor, outlineColor);
+ this._showingHighlight = true;
+ return;
+ }
+
+ // This record doesn't have a highlight, so hide any existing highlight.
+ if (this._showingHighlight) {
+ this._showingHighlight = false;
+ DOMAgent.hideHighlight();
+ }
+ },
+
+ _hideHighlightIfNeeded: function()
+ {
+ this._showingHighlightForRecord = null;
+
+ if (this._showingHighlight) {
+ this._showingHighlight = false;
+ DOMAgent.hideHighlight();
+ }
+ },
+
+ _hoveredOrSelectedRecord: function()
+ {
+ if (this._hoveredDataGridNode)
+ return this._hoveredDataGridNode.record;
+
+ if (this._hoveredTreeElement)
+ return this._hoveredTreeElement.record;
+
+ if (this._dataGrid.selectedNode) {
+ var treeElement = this._dataGrid.treeElementForDataGridNode(this._dataGrid.selectedNode);
+ if (treeElement.revealed())
+ return this._dataGrid.selectedNode.record;
+ }
+
+ return null;
+ },
+
+ _mouseOverDataGrid: function(event)
+ {
+ var hoveredDataGridNode = this._dataGrid.dataGridNodeFromNode(event.target);
+ if (!hoveredDataGridNode)
+ return;
+
+ this._hoveredDataGridNode = hoveredDataGridNode;
+ this._updateHighlight();
+ },
+
+ _mouseLeaveDataGrid: function(event)
+ {
+ this._hoveredDataGridNode = null;
+ this._updateHighlight();
+ },
+
+ _mouseOverTreeOutline: function(event)
+ {
+ var hoveredTreeElement = this.navigationSidebarTreeOutline.treeElementFromNode(event.target);
+ if (!hoveredTreeElement)
+ return;
+
+ this._hoveredTreeElement = hoveredTreeElement;
+ this._updateHighlight();
+ },
+
+ _mouseLeaveTreeOutline: function(event)
+ {
+ this._hoveredTreeElement = null;
+ this._updateHighlight();
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineContentView.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -179,6 +179,14 @@
</span><span class="cx"> this._currentTimelineView.hidden();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ filterDidChange: function()
+ {
+ if (!this._currentTimelineView)
+ return;
+
+ this._currentTimelineView.filterDidChange();
+ },
+
</ins><span class="cx"> updateLayout: function()
</span><span class="cx"> {
</span><span class="cx"> this._timelineOverview.updateLayoutForResize();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -283,6 +283,13 @@
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><ins>+ updateFilter: function()
+ {
+ WebInspector.NavigationSidebarPanel.prototype.updateFilter.call(this);
+
+ this._activeContentView.filterDidChange();
+ },
+
</ins><span class="cx"> hasCustomFilters: function()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -194,6 +194,11 @@
</span><span class="cx"> this._visible = false;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ filterDidChange: function()
+ {
+ // Implemented by sub-classes if needed.
+ },
+
</ins><span class="cx"> matchTreeElementAgainstCustomFilters: function(treeElement)
</span><span class="cx"> {
</span><span class="cx"> // Implemented by sub-classes if needed.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (178543 => 178544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-01-16 00:48:30 UTC (rev 178543)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2015-01-16 01:00:23 UTC (rev 178544)
</span><span class="lines">@@ -364,16 +364,21 @@
</span><span class="cx"> this.onchange(treeElement);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TreeOutline.prototype.treeElementFromNode = function(node)
+{
+ var listNode = node.enclosingNodeOrSelfWithNodeNameInArray(["ol", "li"]);
+ if (listNode)
+ return listNode.parentTreeElement || listNode.treeElement;
+ return null;
+};
+
</ins><span class="cx"> TreeOutline.prototype.treeElementFromPoint = function(x, y)
</span><span class="cx"> {
</span><span class="cx"> var node = this._childrenListNode.ownerDocument.elementFromPoint(x, y);
</span><span class="cx"> if (!node)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- var listNode = node.enclosingNodeOrSelfWithNodeNameInArray(["ol", "li"]);
- if (listNode)
- return listNode.parentTreeElement || listNode.treeElement;
- return null;
</del><ins>+ return this.treeElementFromNode(node);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TreeOutline.prototype._treeKeyDown = function(event)
</span></span></pre>
</div>
</div>
</body>
</html>