[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
eric at webkit.org
eric at webkit.org
Wed Jan 20 22:22:03 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit a7e83145942dd016c476ffc9af9e679051c95287
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 13 16:31:49 2010 +0000
2010-01-13 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Pavel Feldman.
WebInspector: Timeline panel scrolling speed can be increased.
https://bugs.webkit.org/show_bug.cgi?id=33579
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel):
(WebInspector.TimelinePanel.prototype._scheduleRefresh):
(WebInspector.TimelinePanel.prototype._refresh):
(WebInspector.TimelinePanel.prototype._refreshRecords):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 003da51..ef21723 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-13 Ilya Tikhonovsky <loislo at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ WebInspector: Timeline panel scrolling speed can be increased.
+ https://bugs.webkit.org/show_bug.cgi?id=33579
+
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel):
+ (WebInspector.TimelinePanel.prototype._scheduleRefresh):
+ (WebInspector.TimelinePanel.prototype._refresh):
+ (WebInspector.TimelinePanel.prototype._refreshRecords):
+
2010-01-13 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index ac36fa5..91ca711 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -34,7 +34,7 @@ WebInspector.TimelinePanel = function()
this.element.addStyleClass("timeline");
this._overviewPane = new WebInspector.TimelineOverviewPane(this.categories);
- this._overviewPane.addEventListener("window changed", this._scheduleRefresh, this);
+ this._overviewPane.addEventListener("window changed", this._windowChanged, this);
this._overviewPane.addEventListener("filter changed", this._refresh, this);
this.element.appendChild(this._overviewPane.element);
@@ -80,6 +80,7 @@ WebInspector.TimelinePanel = function()
this._records = [];
this._sendRequestRecords = {};
this._calculator = new WebInspector.TimelineCalculator();
+ this._boundariesAreValid = true;
}
WebInspector.TimelinePanel.prototype = {
@@ -291,14 +292,20 @@ WebInspector.TimelinePanel.prototype = {
this._scheduleRefresh(true);
},
- _scheduleRefresh: function(immediate)
+ _windowChanged: function()
{
+ this._scheduleRefresh();
+ },
+
+ _scheduleRefresh: function(preserveBoundaries)
+ {
+ this._boundariesAreValid &= preserveBoundaries;
if (this._needsRefresh)
return;
this._needsRefresh = true;
if (this.visible && !("_refreshTimeout" in this))
- this._refreshTimeout = setTimeout(this._refresh.bind(this), immediate ? 0 : 100);
+ this._refreshTimeout = setTimeout(this._refresh.bind(this), preserveBoundaries ? 0 : 100);
},
_refresh: function()
@@ -308,18 +315,23 @@ WebInspector.TimelinePanel.prototype = {
clearTimeout(this._refreshTimeout);
delete this._refreshTimeout;
}
- this._overviewPane.update(this._records);
- this._refreshRecords();
+
+ if (!this._boundariesAreValid)
+ this._overviewPane.update(this._records);
+ this._refreshRecords(!this._boundariesAreValid);
+ this._boundariesAreValid = true;
},
- _refreshRecords: function()
+ _refreshRecords: function(updateBoundaries)
{
- this._calculator.windowLeft = this._overviewPane.windowLeft;
- this._calculator.windowRight = this._overviewPane.windowRight;
- this._calculator.reset();
+ if (updateBoundaries) {
+ this._calculator.windowLeft = this._overviewPane.windowLeft;
+ this._calculator.windowRight = this._overviewPane.windowRight;
+ this._calculator.reset();
- for (var i = 0; i < this._records.length; ++i)
- this._calculator.updateBoundaries(this._records[i]);
+ for (var i = 0; i < this._records.length; ++i)
+ this._calculator.updateBoundaries(this._records[i]);
+ }
var recordsInWindow = [];
for (var i = 0; i < this._records.length; ++i) {
@@ -391,7 +403,8 @@ WebInspector.TimelinePanel.prototype = {
// Reserve some room for expand / collapse controls to the left for records that start at 0ms.
var timelinePaddingLeft = this._calculator.windowLeft === 0 ? expandOffset : 0;
- this._timelineGrid.updateDividers(true, this._calculator, timelinePaddingLeft);
+ if (updateBoundaries)
+ this._timelineGrid.updateDividers(true, this._calculator, timelinePaddingLeft);
this._adjustScrollPosition((recordsInWindow.length + 1) * rowHeight);
},
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list