[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
pfeldman at chromium.org
pfeldman at chromium.org
Thu Dec 3 13:25:48 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit ba1012ff39434b1d909d4a089bf74b50a690d9df
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 3 19:06:02 2009 +0000
2009-11-03 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: only show timeline records that contribute
to the current window.
https://bugs.webkit.org/show_bug.cgi?id=31069
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel.prototype.refresh):
(WebInspector.TimelineGraph):
(WebInspector.TimelineGraph.prototype.refresh):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50469 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ec3a3f..e7c2bd6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-03 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: only show timeline records that contribute
+ to the current window.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31069
+
+ * inspector/front-end/TimelinePanel.js:
+ (WebInspector.TimelinePanel.prototype.refresh):
+ (WebInspector.TimelineGraph):
+ (WebInspector.TimelineGraph.prototype.refresh):
+
2009-11-03 Patrick Mueller <Patrick_Mueller at us.ibm.com>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index fa76aa0..c3f31da 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -278,7 +278,6 @@ WebInspector.TimelinePanel.prototype = {
refresh: function()
{
WebInspector.AbstractTimelinePanel.prototype.refresh.call(this);
- this._overviewGrid.updateDividers(true, this._overviewCalculator);
// Clear summary bars.
var timelines = {};
@@ -319,6 +318,7 @@ WebInspector.TimelinePanel.prototype = {
chunkStart = -1;
}
}
+ this._overviewGrid.updateDividers(true, this._overviewCalculator);
},
_resizeWindow: function(resizeElement, event)
@@ -610,7 +610,7 @@ WebInspector.TimelineGraph = function(record)
this._graphElement.className = "timeline-graph-side";
this._barAreaElement = document.createElement("div");
- this._barAreaElement.className = "timeline-graph-bar-area hidden";
+ this._barAreaElement.className = "timeline-graph-bar-area";
this._graphElement.appendChild(this._barAreaElement);
this._barElement = document.createElement("div");
@@ -637,11 +637,15 @@ WebInspector.TimelineGraph.prototype = {
this._percentages = percentages;
- this._barAreaElement.removeStyleClass("hidden");
-
- this._barElement.style.setProperty("left", percentages.start + "%");
- this._barElement.style.setProperty("right", (100 - percentages.end) + "%");
-
+ if (percentages.start > 100 || percentages.end < 0) {
+ this._graphElement.addStyleClass("hidden");
+ this.record._itemTreeElement.listItemElement.addStyleClass("hidden");
+ } else {
+ this._barElement.style.setProperty("left", percentages.start + "%");
+ this._barElement.style.setProperty("right", (100 - percentages.end) + "%");
+ this._graphElement.removeStyleClass("hidden");
+ this.record._itemTreeElement.listItemElement.removeStyleClass("hidden");
+ }
var tooltip = (labels.tooltip || "");
this._barElement.title = tooltip;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list