Title: [171739] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 171739
- Author
- lforsch...@apple.com
- Date
- 2014-07-29 01:52:49 -0700 (Tue, 29 Jul 2014)
Log Message
Merged r171721. <rdar://problem/17836658>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171738 => 171739)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-29 08:50:57 UTC (rev 171738)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-29 08:52:49 UTC (rev 171739)
@@ -1,5 +1,26 @@
2014-07-29 Lucas Forschler <lforsch...@apple.com>
+ Merge r171721
+
+ 2014-07-28 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Incorrectly sized TimelineDataGrid event bubble
+ https://bugs.webkit.org/show_bug.cgi?id=135371
+
+ Reviewed by Timothy Hatcher.
+
+ Previously the secondsPerPixel calculation was relying on an element
+ that may not be sized yet. This was resulting in a visibleWidth of 0
+ and resulted in secondsPerPixel being Infinity. Fortunately, the
+ graph data source already knows the secondsPerPixel so we can just
+ ask it. Getting the correct value and eliminating forced layouts.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView.prototype.get secondsPerPixel):
+ * UserInterface/Views/TimelineDataGridNode.js:
+
+2014-07-29 Lucas Forschler <lforsch...@apple.com>
+
Merge r171720
2014-07-28 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (171738 => 171739)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2014-07-29 08:50:57 UTC (rev 171738)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2014-07-29 08:52:49 UTC (rev 171739)
@@ -69,6 +69,11 @@
return WebInspector.UIString("Timeline Events");
},
+ get secondsPerPixel()
+ {
+ return this._timelineRuler.secondsPerPixel;
+ },
+
shown: function()
{
WebInspector.TimelineView.prototype.shown.call(this);
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js (171738 => 171739)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js 2014-07-29 08:50:57 UTC (rev 171738)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineDataGridNode.js 2014-07-29 08:52:49 UTC (rev 171739)
@@ -234,12 +234,9 @@
if (!this.revealed)
return;
- var startTime = this._graphDataSource.startTime;
- var currentTime = this._graphDataSource.currentTime;
- var endTime = this._graphDataSource.endTime;
- var duration = endTime - startTime;
- var visibleWidth = this._graphContainerElement.offsetWidth;
- var secondsPerPixel = duration / visibleWidth;
+ var secondsPerPixel = this._graphDataSource.secondsPerPixel;
+ console.assert(isFinite(secondsPerPixel) && secondsPerPixel > 0);
+
var recordBarIndex = 0;
function createBar(records, renderMode)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
