[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 7296e165a7255faf39cc16fa92cf8db11d4fb1d6
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 18:23:56 2009 +0000

    2009-11-12  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Minor timeline fixes.
    
            https://bugs.webkit.org/show_bug.cgi?id=31417
    
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel.prototype._getRecordDetails):
            (WebInspector.TimelineRecordTreeElement.prototype.onattach):
            (WebInspector.TimelineRecordTreeElement.prototype._updateDetails):
            (WebInspector.TimelineRecordTreeElement.prototype.refresh):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2a5496..378a3fe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-12  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Minor timeline fixes.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31417
+
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._getRecordDetails):
+        (WebInspector.TimelineRecordTreeElement.prototype.onattach):
+        (WebInspector.TimelineRecordTreeElement.prototype._updateDetails):
+        (WebInspector.TimelineRecordTreeElement.prototype.refresh):
+
 2009-11-12  Alexey Proskuryakov  <ap at apple.com>
 
         SnowLeopard build fix.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 527cac6..915a380 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -210,7 +210,8 @@ WebInspector.TimelinePanel.prototype = {
             return WebInspector.displayNameForURL(record.data.url);
         case WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse:
         case WebInspector.TimelineAgent.RecordType.ResourceFinish:
-            return WebInspector.displayNameForURL(this._sendRequestRecords[record.data.identifier].data.url);
+            var sendRequestRecord = this._sendRequestRecords[record.data.identifier];
+            return sendRequestRecord ? WebInspector.displayNameForURL(sendRequestRecord.data.url) : "";
         case WebInspector.TimelineAgent.RecordType.MarkTimeline:
             return record.data.message;
         default:
@@ -532,20 +533,24 @@ WebInspector.TimelineRecordTreeElement.prototype = {
 
             this.dataElement = document.createElement("span");
             this.dataElement.className = "data dimmed";
-            this.dataElement.textContent = "(" + this._record.details + ")";
-            this.dataElement.title = this._record.details;
+            this._updateDetails();
 
             this.listItemElement.appendChild(separatorElement);
             this.listItemElement.appendChild(this.dataElement);
         }
     },
 
+    _updateDetails: function() {
+        if (this.dataElement && this._record.details !== this._details) {
+            this._details = this._record.details;
+            this.dataElement.textContent = "(" + this._details + ")";
+            this.dataElement.title = this._details;
+        }
+    },
+
     refresh: function()
     {
-        if (this._record.details) {
-            this.dataElement.textContent = "(" + this._record.details + ")";
-            this.dataElement.title = this._record.details;
-        }
+        this._updateDetails();
 
         if (this._record.count <= 1)
             return;

-- 
WebKit Debian packaging