Title: [171810] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 171810
- Author
- [email protected]
- Date
- 2014-07-30 13:33:00 -0700 (Wed, 30 Jul 2014)
Log Message
Merged r171783. <rdar://problem/17848773>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-07-30 20:33:00 UTC (rev 171810)
@@ -1,3 +1,28 @@
+2014-07-30 Lucas Forschler <[email protected]>
+
+ Merge r171783
+
+ 2014-07-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Eliminate more forced layouts during timeline recordings
+ https://bugs.webkit.org/show_bug.cgi?id=135397
+
+ Reviewed by Timothy Hatcher.
+
+ Instead of computing the secondsPerPixel in each overview graph,
+ we can ask the overview view itself which has a cached value.
+ The computation used to force a layout, now it doesn't need to.
+
+ * UserInterface/Views/LayoutTimelineOverviewGraph.js:
+ * UserInterface/Views/NetworkTimelineOverviewGraph.js:
+ * UserInterface/Views/ScriptTimelineOverviewGraph.js:
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ * UserInterface/Views/TimelineOverviewGraph.js:
+ (WebInspector.TimelineOverviewGraph):
+ (WebInspector.TimelineOverviewGraph.prototype.get timelineOverview):
+ (WebInspector.TimelineOverviewGraph.prototype.set timelineOverview):
+
2014-07-29 Lucas Forschler <[email protected]>
Merge r171721
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineOverviewGraph.js (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineOverviewGraph.js 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineOverviewGraph.js 2014-07-30 20:33:00 UTC (rev 171810)
@@ -58,8 +58,7 @@
{
WebInspector.TimelineOverviewGraph.prototype.updateLayout.call(this);
- var visibleWidth = this.element.offsetWidth;
- var secondsPerPixel = (this.endTime - this.startTime) / visibleWidth;
+ var secondsPerPixel = this.timelineOverview.secondsPerPixel;
var recordBarIndex = 0;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js 2014-07-30 20:33:00 UTC (rev 171810)
@@ -75,8 +75,7 @@
{
WebInspector.TimelineOverviewGraph.prototype.updateLayout.call(this);
- var visibleWidth = this.element.offsetWidth;
- var secondsPerPixel = (this.endTime - this.startTime) / visibleWidth;
+ var secondsPerPixel = this.timelineOverview.secondsPerPixel;
var recordBarIndex = 0;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js 2014-07-30 20:33:00 UTC (rev 171810)
@@ -58,8 +58,7 @@
{
WebInspector.TimelineOverviewGraph.prototype.updateLayout.call(this);
- var visibleWidth = this.element.offsetWidth;
- var secondsPerPixel = (this.endTime - this.startTime) / visibleWidth;
+ var secondsPerPixel = this.timelineOverview.secondsPerPixel;
var recordBarIndex = 0;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2014-07-30 20:33:00 UTC (rev 171810)
@@ -37,8 +37,10 @@
this._timelineOverviewGraphsMap = timelineOverviewGraphsMap;
- for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values())
+ for (var timelineOverviewGraph of this._timelineOverviewGraphsMap.values()) {
+ timelineOverviewGraph.timelineOverview = this;
this._graphsContainer.appendChild(timelineOverviewGraph.element);
+ }
this._timelineRuler = new WebInspector.TimelineRuler;
this._timelineRuler.allowsClippedLabels = true;
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js (171809 => 171810)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2014-07-30 20:31:05 UTC (rev 171809)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js 2014-07-30 20:33:00 UTC (rev 171810)
@@ -34,6 +34,7 @@
this._startTime = 0;
this._endTime = 5;
this._currentTime = 0;
+ this._timelineOverview = null;
};
WebInspector.TimelineOverviewGraph.StyleClassName = "timeline-overview-graph";
@@ -107,6 +108,16 @@
this.needsLayout();
},
+ get timelineOverview()
+ {
+ return this._timelineOverview;
+ },
+
+ set timelineOverview(x)
+ {
+ this._timelineOverview = x;
+ },
+
reset: function()
{
// Implemented by sub-classes if needed.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
