[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0d461807fbbd551582d617ec8f05fc5bd491af74
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 22:09:35 2010 +0000

    2010-03-10  Ilya Tikhonovsky  <loislo at loislo-macbookpro.local>
    
            Reviewed by Pavel Feldman.
    
            Sidebar resize element height was adjusted.
            Display name for Function Call details was adjusted.
    
            https://bugs.webkit.org/show_bug.cgi?id=35939
    
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel.prototype._refreshRecords):
            (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f66b64..3aebf8f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-10  Ilya Tikhonovsky  <loislo at loislo-macbookpro.local>
+
+        Reviewed by Pavel Feldman.
+
+        Sidebar resize element height was adjusted.
+        Display name for Function Call details was adjusted.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35939
+
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._refreshRecords):
+        (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
+
 2010-03-10  Charles Wei  <charles.wei at torchmobile.com.cn>
 
         Reviewed by George Staikos.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 7033012..b766a5e 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -383,6 +383,7 @@ WebInspector.TimelinePanel.prototype = {
         }
 
         this._itemsGraphsElement.insertBefore(this._graphRowsElement, this._bottomGapElement);
+        this.sidebarResizeElement.style.height = this.sidebarElement.clientHeight + "px";
         // Reserve some room for expand / collapse controls to the left for records that start at 0ms.
         var timelinePaddingLeft = this._calculator.windowLeft === 0 ? expandOffset : 0;
         if (updateBoundaries)
@@ -746,7 +747,7 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
     {
         switch (record.type) {
             case WebInspector.TimelineAgent.RecordType.FunctionCall:
-                return WebInspector.displayNameForURL(record.data.scriptName + ":" + record.data.scriptLine);
+                return WebInspector.displayNameForURL(record.data.scriptName) + ":" + record.data.scriptLine;
             case WebInspector.TimelineAgent.RecordType.EventDispatch:
                 return record.data ? record.data.type : "";
             case WebInspector.TimelineAgent.RecordType.Paint:

-- 
WebKit Debian packaging