<!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>[201009] branches/safari-602.1.32-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/201009">201009</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 01:47:13 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200792">r200792</a>. rdar://problem/26253394</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201008 => 201009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:11 UTC (rev 201008)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-17 08:47:13 UTC (rev 201009)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200792. rdar://problem/26253394
+
+ 2016-05-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Layout timeline popovers are inconsistently shown
+ https://bugs.webkit.org/show_bug.cgi?id=157640
+ <rdar://problem/26253394>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid.prototype._showPopoverForSelectedNodeSoon):
+ Fix the bug by clearing _showPopoverTimeout when we show the popover.
+
+ (WebInspector.TimelineDataGrid.prototype._hidePopover):
+ Modernize the code to use arrow functions and avoid binds.
+
+ (WebInspector.TimelineDataGrid.prototype._updatePopoverForSelectedNode):
+ Updating with presentNewContentWithFrame animates the popover to the correct
+ position instead of jumping and ending up at the wrong location.
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200708. rdar://problem/26228913
</span><span class="cx">
</span><span class="cx"> 2016-05-11 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (201008 => 201009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-05-17 08:47:11 UTC (rev 201008)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-05-17 08:47:13 UTC (rev 201009)
</span><span class="lines">@@ -450,15 +450,12 @@
</span><span class="cx"> if (this._showPopoverTimeout)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- function delayedWork()
- {
</del><ins>+ this._showPopoverTimeout = setTimeout(() => {
</ins><span class="cx"> if (!this._popover)
</span><span class="cx"> this._popover = new WebInspector.Popover;
</span><del>-
</del><span class="cx"> this._updatePopoverForSelectedNode(true);
</span><del>- }
-
- this._showPopoverTimeout = setTimeout(delayedWork.bind(this), WebInspector.TimelineDataGrid.DelayedPopoverShowTimeout);
</del><ins>+ this._showPopoverTimeout = undefined;
+ }, WebInspector.TimelineDataGrid.DelayedPopoverShowTimeout);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _hidePopover()
</span><span class="lines">@@ -471,15 +468,13 @@
</span><span class="cx"> if (this._popover)
</span><span class="cx"> this._popover.dismiss();
</span><span class="cx">
</span><del>- function delayedWork()
- {
- if (this._popoverCallStackTreeOutline)
- this._popoverCallStackTreeOutline.removeChildren();
- }
-
</del><span class="cx"> if (this._hidePopoverContentClearTimeout)
</span><span class="cx"> clearTimeout(this._hidePopoverContentClearTimeout);
</span><del>- this._hidePopoverContentClearTimeout = setTimeout(delayedWork.bind(this), WebInspector.TimelineDataGrid.DelayedPopoverHideContentClearTimeout);
</del><ins>+
+ this._hidePopoverContentClearTimeout = setTimeout(() => {
+ if (this._popoverCallStackTreeOutline)
+ this._popoverCallStackTreeOutline.removeChildren();
+ }, WebInspector.TimelineDataGrid.DelayedPopoverHideContentClearTimeout);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _updatePopoverForSelectedNode(updateContent)
</span><span class="lines">@@ -487,15 +482,14 @@
</span><span class="cx"> if (!this._popover || !this.selectedNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var targetPopoverElement = this.callFramePopoverAnchorElement();
</del><ins>+ let targetPopoverElement = this.callFramePopoverAnchorElement();
</ins><span class="cx"> console.assert(targetPopoverElement, "TimelineDataGrid subclass should always return a valid element from callFramePopoverAnchorElement.");
</span><span class="cx"> if (!targetPopoverElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var targetFrame = WebInspector.Rect.rectFromClientRect(targetPopoverElement.getBoundingClientRect());
-
</del><span class="cx"> // The element might be hidden if it does not have a width and height.
</span><del>- if (!targetFrame.size.width && !targetFrame.size.height)
</del><ins>+ let rect = WebInspector.Rect.rectFromClientRect(targetPopoverElement.getBoundingClientRect());
+ if (!rect.size.width && !targetFrame.rect.height)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (this._hidePopoverContentClearTimeout) {
</span><span class="lines">@@ -503,10 +497,13 @@
</span><span class="cx"> this._hidePopoverContentClearTimeout = undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (updateContent)
- this._popover.content = this._createPopoverContent();
</del><ins>+ let targetFrame = rect.pad(2);
+ let preferredEdges = [WebInspector.RectEdge.MAX_Y, WebInspector.RectEdge.MIN_Y, WebInspector.RectEdge.MAX_X];
</ins><span class="cx">
</span><del>- this._popover.present(targetFrame.pad(2), [WebInspector.RectEdge.MAX_Y, WebInspector.RectEdge.MIN_Y, WebInspector.RectEdge.MAX_X]);
</del><ins>+ if (updateContent)
+ this._popover.presentNewContentWithFrame(this._createPopoverContent(), targetFrame, preferredEdges);
+ else
+ this._popover.present(targetFrame, preferredEdges);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _createPopoverContent()
</span><span class="lines">@@ -548,8 +545,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.TimelineDataGrid.WasExpandedDuringFilteringSymbol = Symbol("was-expanded-during-filtering");
-
</del><span class="cx"> WebInspector.TimelineDataGrid.HasNonDefaultFilterStyleClassName = "has-non-default-filter";
</span><span class="cx"> WebInspector.TimelineDataGrid.DelayedPopoverShowTimeout = 250;
</span><span class="cx"> WebInspector.TimelineDataGrid.DelayedPopoverHideContentClearTimeout = 500;
</span></span></pre>
</div>
</div>
</body>
</html>