Title: [113190] trunk/Source/WebCore
- Revision
- 113190
- Author
- ca...@chromium.org
- Date
- 2012-04-04 08:23:52 -0700 (Wed, 04 Apr 2012)
Log Message
Web Inspector: time dividers are incorrectly rendered on empty timeline grid
https://bugs.webkit.org/show_bug.cgi?id=83165
Reviewed by Pavel Feldman.
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkBaseCalculator.prototype.setDisplayWindow):
* inspector/front-end/TimelineGrid.js:
(WebInspector.TimelineGrid.prototype.updateDividers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113189 => 113190)
--- trunk/Source/WebCore/ChangeLog 2012-04-04 15:15:25 UTC (rev 113189)
+++ trunk/Source/WebCore/ChangeLog 2012-04-04 15:23:52 UTC (rev 113190)
@@ -1,3 +1,15 @@
+2012-04-04 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: time dividers are incorrectly rendered on empty timeline grid
+ https://bugs.webkit.org/show_bug.cgi?id=83165
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkBaseCalculator.prototype.setDisplayWindow):
+ * inspector/front-end/TimelineGrid.js:
+ (WebInspector.TimelineGrid.prototype.updateDividers):
+
2012-04-04 Sergio Villar Senin <svil...@igalia.com>
[GTK] ASSERT in SocketStreamHandleSoup.cpp
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (113189 => 113190)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-04-04 15:15:25 UTC (rev 113189)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-04-04 15:23:52 UTC (rev 113190)
@@ -1501,6 +1501,7 @@
setDisplayWindow: function(clientWidth)
{
this._workingArea = clientWidth;
+ this.paddingLeft = 0;
}
}
Modified: trunk/Source/WebCore/inspector/front-end/TimelineGrid.js (113189 => 113190)
--- trunk/Source/WebCore/inspector/front-end/TimelineGrid.js 2012-04-04 15:15:25 UTC (rev 113189)
+++ trunk/Source/WebCore/inspector/front-end/TimelineGrid.js 2012-04-04 15:23:52 UTC (rev 113190)
@@ -107,15 +107,17 @@
dividerLabelBar.removeStyleClass("last");
}
- var left = calculator.computePosition(calculator.minimumBoundary + slice * i);
+ var left;
+ if (!slice) {
+ left = dividersElementClientWidth / dividerCount * i + paddingLeft;
+ dividerLabelBar._labelElement.textContent = "";
+ } else {
+ left = calculator.computePosition(calculator.minimumBoundary + slice * i);
+ dividerLabelBar._labelElement.textContent = calculator.formatTime(slice * i);
+ }
var percentLeft = 100 * left / dividersElementClientWidth;
this._setDividerAndBarLeft(divider, dividerLabelBar, percentLeft);
- if (!isNaN(slice))
- dividerLabelBar._labelElement.textContent = calculator.formatTime(slice * i);
- else
- dividerLabelBar._labelElement.textContent = "";
-
divider = divider.nextSibling;
dividerLabelBar = dividerLabelBar.nextSibling;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
