[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 46c97705c41d7505a06b3175e1d24912fc646044
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 6 13:41:34 2009 +0000

    2009-11-06  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Fix resource content search.
            https://bugs.webkit.org/show_bug.cgi?id=31202
    
            * inspector/front-end/AbstractTimelinePanel.js:
            (WebInspector.AbstractTimelinePanel.prototype.refresh):
            (WebInspector.AbstractTimelinePanel.prototype.removeItem):
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelineGraph.prototype.refresh):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a6a0885..02de2ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-06  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix resource content search.
+        https://bugs.webkit.org/show_bug.cgi?id=31202
+
+        * inspector/front-end/AbstractTimelinePanel.js:
+        (WebInspector.AbstractTimelinePanel.prototype.refresh):
+        (WebInspector.AbstractTimelinePanel.prototype.removeItem):
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelineGraph.prototype.refresh):
+
 2009-11-05  Yuta Kitamura  <yutak at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/front-end/AbstractTimelinePanel.js b/WebCore/inspector/front-end/AbstractTimelinePanel.js
index d285f36..b7a74ff 100644
--- a/WebCore/inspector/front-end/AbstractTimelinePanel.js
+++ b/WebCore/inspector/front-end/AbstractTimelinePanel.js
@@ -289,17 +289,17 @@ WebInspector.AbstractTimelinePanel.prototype = {
 
         for (var i = 0; i < staleItemsLength; ++i) {
             var item = this._staleItems[i];
-            if (!item._itemTreeElement) {
+            if (!item._itemsTreeElement) {
                 // Create the timeline tree element and graph.
-                item._itemTreeElement = this.createItemTreeElement(item);
-                item._itemTreeElement._itemGraph = this.createItemGraph(item);
+                item._itemsTreeElement = this.createItemTreeElement(item);
+                item._itemsTreeElement._itemGraph = this.createItemGraph(item);
 
-                this.itemsTreeElement.appendChild(item._itemTreeElement);
-                this.itemsGraphsElement.appendChild(item._itemTreeElement._itemGraph.graphElement);
+                this.itemsTreeElement.appendChild(item._itemsTreeElement);
+                this.itemsGraphsElement.appendChild(item._itemsTreeElement._itemGraph.graphElement);
             }
 
-            if (item._itemTreeElement.refresh)
-                item._itemTreeElement.refresh();
+            if (item._itemsTreeElement.refresh)
+                item._itemsTreeElement.refresh();
 
             if (this.calculator.updateBoundaries(item))
                 boundariesChanged = true;
@@ -312,7 +312,7 @@ WebInspector.AbstractTimelinePanel.prototype = {
         }
 
         for (var i = 0; i < staleItemsLength; ++i)
-            this._staleItems[i]._itemTreeElement._itemGraph.refresh(this.calculator);
+            this._staleItems[i]._itemsTreeElement._itemGraph.refresh(this.calculator);
 
         this._staleItems = [];
 
@@ -370,12 +370,12 @@ WebInspector.AbstractTimelinePanel.prototype = {
     {
         this._items.remove(item, true);
 
-        if (item._itemTreeElement) {
-            this.itemsTreeElement.removeChild(resource._itemTreeElement);
-            this.itemsGraphsElement.removeChild(resource._itemTreeElement._itemGraph.graphElement);
+        if (item._itemsTreeElement) {
+            this.itemsTreeElement.removeChild(resource._itemsTreeElement);
+            this.itemsGraphsElement.removeChild(resource._itemsTreeElement._itemGraph.graphElement);
         }
 
-        delete item._itemTreeElement;
+        delete item._itemsTreeElement;
         this.adjustScrollPosition();
     },
 
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 5f3dca8..527cac6 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -716,12 +716,12 @@ WebInspector.TimelineGraph.prototype = {
 
         if (percentages.start > 100 || percentages.end < 0) {
             this._graphElement.addStyleClass("hidden");
-            this.record._itemTreeElement.listItemElement.addStyleClass("hidden");
+            this.record._itemsTreeElement.listItemElement.addStyleClass("hidden");
         } else {
             this._barElement.style.setProperty("left", percentages.start + "%");
             this._barElement.style.setProperty("right", (100 - percentages.end) + "%");
             this._graphElement.removeStyleClass("hidden");
-            this.record._itemTreeElement.listItemElement.removeStyleClass("hidden");
+            this.record._itemsTreeElement.listItemElement.removeStyleClass("hidden");
         }
         var tooltip = (labels.tooltip || "");
         this._barElement.title = tooltip;

-- 
WebKit Debian packaging