[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit dc2f188e750c72fec58af09271053a6c08ee2ee4
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 13:02:28 2010 +0000

    2010-03-13  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            WebInspector: Position of GraphBar elements is calculating more carefully
            and they fully visible at the bottom of Timeline panel.
    
            http://bugs.webkit.org/show_bug.cgi?id=35966
    
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelineRecordGraphRow.prototype.update):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55991 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b32127b..8458bbf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-13  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        WebInspector: Position of GraphBar elements is calculating more carefully
+        and they fully visible at the bottom of Timeline panel.
+       
+        http://bugs.webkit.org/show_bug.cgi?id=35966
+
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelineRecordGraphRow.prototype.update):
+
 2010-03-15  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index b766a5e..ddddbd5 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -570,11 +570,15 @@ WebInspector.TimelineRecordGraphRow = function(graphContainer, scheduleRefresh,
 WebInspector.TimelineRecordGraphRow.prototype = {
     update: function(record, isEven, calculator, clientWidth, expandOffset, index)
     {
+        const minWidth = 5;
+        const borderWidth = 4;
+        var workingArea = clientWidth - expandOffset - minWidth - borderWidth;
         this._record = record;
         this.element.className = "timeline-graph-side timeline-category-" + record.category.name + (isEven ? " even" : "");
         var percentages = calculator.computeBarGraphPercentages(record);
-        var left = percentages.start / 100 * clientWidth;
-        var width = (percentages.end - percentages.start) / 100 * clientWidth;
+        var left = percentages.start / 100 * workingArea;
+        var width = (percentages.end - percentages.start) / 100 * workingArea;
+        width = width > minWidth ? width : minWidth;
         this._barElement.style.left = (left + expandOffset) + "px";
         this._barElement.style.width = width + "px";
 

-- 
WebKit Debian packaging