[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f6847f70bbb3e249f57544839a9c2fbfd5b4d7d2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 02:08:21 2010 +0000

    2010-01-20  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Timeline reset button doesn't clean timeline if the panel is scrolled down.
            The overview pane also stay dirty after reset.
            https://bugs.webkit.org/show_bug.cgi?id=33829
    
            * inspector/front-end/TimelineGrid.js:
            (WebInspector.TimelineGrid.prototype.updateDividers):
            * inspector/front-end/TimelineOverviewPane.js:
            (WebInspector.TimelineOverviewPane.prototype.reset):
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel.prototype.reset):
            (WebInspector.TimelinePanel.prototype._refreshRecords):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53588 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ccca00a..dabfd68 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-20  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Timeline reset button doesn't clean timeline if the panel is scrolled down.
+        The overview pane also stay dirty after reset.
+        https://bugs.webkit.org/show_bug.cgi?id=33829
+
+        * inspector/front-end/TimelineGrid.js:
+        (WebInspector.TimelineGrid.prototype.updateDividers):
+        * inspector/front-end/TimelineOverviewPane.js:
+        (WebInspector.TimelineOverviewPane.prototype.reset):
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype.reset):
+        (WebInspector.TimelinePanel.prototype._refreshRecords):
+
 2010-01-20  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/inspector/front-end/TimelineGrid.js b/WebCore/inspector/front-end/TimelineGrid.js
index db9cc1e..12b889a 100644
--- a/WebCore/inspector/front-end/TimelineGrid.js
+++ b/WebCore/inspector/front-end/TimelineGrid.js
@@ -100,6 +100,8 @@ WebInspector.TimelineGrid.prototype = {
 
             if (!isNaN(slice))
                 dividerLabelBar._labelElement.textContent = calculator.formatValue(slice * i);
+            else
+                dividerLabelBar._labelElement.textContent = "";
 
             divider = divider.nextSibling;
             dividerLabelBar = dividerLabelBar.nextSibling;
diff --git a/WebCore/inspector/front-end/TimelineOverviewPane.js b/WebCore/inspector/front-end/TimelineOverviewPane.js
index b673abe..8ae8352 100644
--- a/WebCore/inspector/front-end/TimelineOverviewPane.js
+++ b/WebCore/inspector/front-end/TimelineOverviewPane.js
@@ -173,10 +173,11 @@ WebInspector.TimelineOverviewPane.prototype = {
 
     reset: function()
     {
-        this._overviewCalculator.reset();
-        this._overviewGrid.updateDividers(true, this._overviewCalculator);
         this.windowLeft = 0.0;
         this.windowRight = 1.0;
+        this._setWindowPosition(0, this._overviewGrid.element.clientWidth);
+        this._overviewCalculator.reset();
+        this._overviewGrid.updateDividers(true, this._overviewCalculator);
     },
 
     _resizeWindow: function(resizeElement, event)
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 276acd9..b6d5fde 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -271,8 +271,10 @@ WebInspector.TimelinePanel.prototype = {
     {
         this._lastRecord = null;
         this._sendRequestRecords = {};
-        this._overviewPane.reset();
         this._records = [];
+        this._boundariesAreValid = false;
+        this._overviewPane.reset();
+        this._adjustScrollPosition(0);
         this._refresh();
     },
 
@@ -296,7 +298,7 @@ WebInspector.TimelinePanel.prototype = {
     {
         this._scheduleRefresh();
     },
-  
+
     _scheduleRefresh: function(preserveBoundaries)
     {
         this._boundariesAreValid &= preserveBoundaries;
@@ -356,11 +358,11 @@ WebInspector.TimelinePanel.prototype = {
         const expandOffset = 15;
 
         // Convert visible area to visible indexes. Always include top-level record for a visible nested record.
-        var startIndex = Math.max(0, Math.floor(visibleTop / rowHeight) - 1);
+        var startIndex = Math.max(0, Math.min(Math.floor(visibleTop / rowHeight) - 1, recordsInWindow.length - 1));
         while (startIndex > 0 && recordsInWindow[startIndex].parent)
             startIndex--;
         var endIndex = Math.min(recordsInWindow.length, Math.ceil(visibleBottom / rowHeight));
-        while (endIndex < recordsInWindow.length - 1 && recordsInWindow[startIndex].parent)
+        while (endIndex < recordsInWindow.length - 1 && recordsInWindow[endIndex].parent)
             endIndex++;
 
         // Resize gaps first.

-- 
WebKit Debian packaging