[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 14109ac3aa0da84035c5c921155fad0dfebfb8dc
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 18:14:51 2010 +0000

    2010-03-06  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Web Inspector: switching to/from Timeline Panel moves scroller.
            (Also added couple of record details items as I was fixing it).
    
            https://bugs.webkit.org/show_bug.cgi?id=35829
    
            * English.lproj/localizedStrings.js:
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel):
            (WebInspector.TimelinePanel.prototype.get defaultFocusedElement):
            (WebInspector.TimelinePanel.prototype.show):
            (WebInspector.TimelinePanel.prototype._refreshRecords):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1fee9a2..da1b584 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-06  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Web Inspector: switching to/from Timeline Panel moves scroller.
+        (Also added couple of record details items as I was fixing it).
+
+        https://bugs.webkit.org/show_bug.cgi?id=35829
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel):
+        (WebInspector.TimelinePanel.prototype.get defaultFocusedElement):
+        (WebInspector.TimelinePanel.prototype.show):
+        (WebInspector.TimelinePanel.prototype._refreshRecords):
+        (WebInspector.TimelinePanel.FormattedRecord.prototype._generatePopupContent):
+
 2010-03-06  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 281d845..6055896 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 d9f6615..7033012 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -37,6 +37,7 @@ WebInspector.TimelinePanel = function()
     this._overviewPane.addEventListener("window changed", this._windowChanged, this);
     this._overviewPane.addEventListener("filter changed", this._refresh, this);
     this.element.appendChild(this._overviewPane.element);
+    this.element.tabIndex = 0;
 
     this._sidebarBackgroundElement = document.createElement("div");
     this._sidebarBackgroundElement.className = "sidebar timeline-sidebar-background";
@@ -113,6 +114,11 @@ WebInspector.TimelinePanel.prototype = {
         return this._categories;
     },
 
+    get defaultFocusedElement()
+    {
+        return this.element;
+    },
+
     get _recordStyles()
     {
         if (!this._recordStylesArray) {
@@ -234,8 +240,9 @@ WebInspector.TimelinePanel.prototype = {
     show: function()
     {
         WebInspector.Panel.prototype.show.call(this);
-
-        if (this._needsRefresh)
+        if (typeof this._scrollTop === "number")
+            this._containerElement.scrollTop = this._scrollTop;
+        else if (this._needsRefresh)
             this._refresh();
     },
 
@@ -313,7 +320,8 @@ WebInspector.TimelinePanel.prototype = {
         }
 
         // Calculate the visible area.
-        var visibleTop = this._containerElement.scrollTop;
+        this._scrollTop = this._containerElement.scrollTop;
+        var visibleTop = this._scrollTop;
         var visibleBottom = visibleTop + this._containerElement.clientHeight;
 
         // Define row height, should be in sync with styles for timeline graphs.
@@ -699,9 +707,9 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
 
         const recordTypes = WebInspector.TimelineAgent.RecordType;
         if (this.details) {
-            if (this.type == recordTypes.TimerInstall ||
-                this.type == recordTypes.TimerFire ||
-                this.type == recordTypes.TimerRemove) {
+            if (this.type === recordTypes.TimerInstall ||
+                this.type === recordTypes.TimerFire ||
+                this.type === recordTypes.TimerRemove) {
                 recordContentTable.appendChild(this._createRow(WebInspector.UIString("Timer Id"), this.data.timerId));
                 if (this.timeout) {
                     recordContentTable.appendChild(this._createRow(WebInspector.UIString("Timeout"), this.timeout));
@@ -711,12 +719,18 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
                     var link = WebInspector.linkifyResourceAsNode(this.callSiteScriptName, "scripts", this.callSiteScriptLine, "timeline-details");
                     recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Call Site"), link));
                 }
-            } else if (this.type == recordTypes.FunctionCall) {
+            } else if (this.type === recordTypes.FunctionCall) {
                 var link = WebInspector.linkifyResourceAsNode(this.data.scriptName, "scripts", this.data.scriptLine, "timeline-details");
                 recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Location"), link));
             } else if (this.type === recordTypes.ResourceSendRequest || this.type === recordTypes.ResourceReceiveResponse || this.type === recordTypes.ResourceFinish) {
                 var link = WebInspector.linkifyResourceAsNode(this.data.url, "resources", null, "timeline-details");
                 recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Resource"), link));
+            } else if (this.type === recordTypes.EvaluateScript) {
+                var link = WebInspector.linkifyResourceAsNode(this.data.url, "scripts", null, "timeline-details");
+                recordContentTable.appendChild(this._createLinkRow(WebInspector.UIString("Script"), link));
+            } else if (this.type === recordTypes.Paint) {
+                recordContentTable.appendChild(this._createRow(WebInspector.UIString("Location"), this.data.x + "\u2009\u00d7\u2009" + this.data.y));
+                recordContentTable.appendChild(this._createRow(WebInspector.UIString("Dimensions"), this.data.width + "\u2009\u00d7\u2009" + this.data.height));
             } else
                 recordContentTable.appendChild(this._createRow(WebInspector.UIString("Details"), this.details));
         }

-- 
WebKit Debian packaging