[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 c2b52d21cb9d174e3b580ba38f25e90caa5e22a7
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 10:06:51 2009 +0000

    2009-11-04  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Make resource-related records in timeline
            actually take some time.
    
            https://bugs.webkit.org/show_bug.cgi?id=31139
    
            * English.lproj/localizedStrings.js:
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel):
            (WebInspector.TimelinePanel.prototype._formatRecord):
            (WebInspector.TimelinePanel.prototype._getRecordDetails):
            (WebInspector.TimelinePanel.prototype.reset):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50560 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 49ad3fa..cf9032e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-04  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Make resource-related records in timeline
+        actually take some time.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31139
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel):
+        (WebInspector.TimelinePanel.prototype._formatRecord):
+        (WebInspector.TimelinePanel.prototype._getRecordDetails):
+        (WebInspector.TimelinePanel.prototype.reset):
+
 2009-11-04  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index c1b00b4..b6b05c5 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 3503dad..5f3dca8 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -45,7 +45,7 @@ WebInspector.TimelinePanel = function()
     this.calculator = new WebInspector.TimelineCalculator();
     for (category in this.categories)
         this.showCategory(category);
-    this._resourceURLs = {};
+    this._sendRequestRecords = {};
 }
 
 WebInspector.TimelinePanel.prototype = {
@@ -171,11 +171,27 @@ WebInspector.TimelinePanel.prototype = {
         formattedRecord.data = record.data;
         formattedRecord.count = 1;
         formattedRecord.type = record.type;
-        formattedRecord.details = this._getRecordDetails(record);
         formattedRecord.endTime = (typeof record.endTime !== "undefined") ? record.endTime / 1000 : formattedRecord.startTime;
+
+        // Make resource receive record last since request was sent; make finish record last since response received.
+        if (record.type === WebInspector.TimelineAgent.RecordType.ResourceSendRequest) {
+            this._sendRequestRecords[record.data.identifier] = formattedRecord;
+        } else if (record.type === WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse) {
+            var sendRequestRecord = this._sendRequestRecords[record.data.identifier];
+            sendRequestRecord._responseReceivedFormattedTime = formattedRecord.startTime;
+            formattedRecord.startTime = sendRequestRecord.startTime;
+            sendRequestRecord.details = this._getRecordDetails(record);
+            this.refreshItem(sendRequestRecord);
+        } else if (record.type === WebInspector.TimelineAgent.RecordType.ResourceFinish) {
+            var sendRequestRecord = this._sendRequestRecords[record.data.identifier];
+            if (sendRequestRecord) // False for main resource.
+                formattedRecord.startTime = sendRequestRecord._responseReceivedFormattedTime;
+        }
+        formattedRecord.details = this._getRecordDetails(record);
+
         return formattedRecord;
     },
-    
+
     _getRecordDetails: function(record)
     {
         switch (record.type) {
@@ -191,11 +207,10 @@ WebInspector.TimelinePanel.prototype = {
         case WebInspector.TimelineAgent.RecordType.XHRLoad:
         case WebInspector.TimelineAgent.RecordType.EvaluateScript:
         case WebInspector.TimelineAgent.RecordType.ResourceSendRequest:
-            this._resourceURLs[record.data.identifier] = record.data.url;
             return WebInspector.displayNameForURL(record.data.url);
         case WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse:
         case WebInspector.TimelineAgent.RecordType.ResourceFinish:
-            return WebInspector.displayNameForURL(this._resourceURLs[record.data.identifier]);
+            return WebInspector.displayNameForURL(this._sendRequestRecords[record.data.identifier].data.url);
         case WebInspector.TimelineAgent.RecordType.MarkTimeline:
             return record.data.message;
         default:
@@ -211,7 +226,7 @@ WebInspector.TimelinePanel.prototype = {
         for (var category in this.categories)
             this._categoryGraphs[category].clearChunks();
         this._setWindowPosition(0, this._overviewGridElement.clientWidth);
-        this._resourceURLs = {};
+        this._sendRequestRecords = {};
     },
 
     _createOverview: function()
@@ -515,18 +530,23 @@ WebInspector.TimelineRecordTreeElement.prototype = {
             separatorElement.className = "separator";
             separatorElement.textContent = " ";
 
-            var dataElement = document.createElement("span");
-            dataElement.className = "data dimmed";
-            dataElement.textContent = "(" + this._record.details + ")";
-            dataElement.title = this._record.details;
+            this.dataElement = document.createElement("span");
+            this.dataElement.className = "data dimmed";
+            this.dataElement.textContent = "(" + this._record.details + ")";
+            this.dataElement.title = this._record.details;
 
             this.listItemElement.appendChild(separatorElement);
-            this.listItemElement.appendChild(dataElement);
+            this.listItemElement.appendChild(this.dataElement);
         }
     },
 
     refresh: function()
     {
+        if (this._record.details) {
+            this.dataElement.textContent = "(" + this._record.details + ")";
+            this.dataElement.title = this._record.details;
+        }
+
         if (this._record.count <= 1)
             return;
 
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index afbda4d..035dc13 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -3501,10 +3501,10 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     position: absolute;
     top: 0;
     bottom: 0;
-    margin: auto -5px;
+    margin: auto -2px;
     border-width: 4px 4px 5px;
     height: 9px;
-    min-width: 7px;
+    min-width: 5px;
     opacity: 0.8;
     -webkit-border-image: url(Images/timelineBarGray.png) 4 4 5 4;
     pointer-events: none;

-- 
WebKit Debian packaging