[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mnaganov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 06caef7ca4e4e97d322201f48f015c7470540ec3
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 17:27:14 2010 +0000

    2010-08-26  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: fix CPU profile header entries doubling on Inspector re-opening.
    
            https://bugs.webkit.org/show_bug.cgi?id=44685
    
            * inspector/front-end/ProfilesPanel.js:
            (WebInspector.ProfilesPanel.prototype.show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f4f2a1f..0c34171 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-26  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: fix CPU profile header entries doubling on Inspector re-opening.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44685
+
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype.show):
+
 2010-08-26  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Darin Adler and Maciej Stachowiak.
diff --git a/WebCore/inspector/front-end/ProfilesPanel.js b/WebCore/inspector/front-end/ProfilesPanel.js
index 2174b87..f2aab76 100644
--- a/WebCore/inspector/front-end/ProfilesPanel.js
+++ b/WebCore/inspector/front-end/ProfilesPanel.js
@@ -158,8 +158,7 @@ WebInspector.ProfilesPanel.prototype = {
     show: function()
     {
         WebInspector.Panel.prototype.show.call(this);
-        if (!this._profilesWereRequested)
-            this._populateProfiles();
+        this._populateProfiles();
     },
 
     profilerWasEnabled: function()
@@ -510,12 +509,8 @@ WebInspector.ProfilesPanel.prototype = {
 
     _populateProfiles: function()
     {
-        var sidebarTreeChildrenCount = this.sidebarTree.children.length;
-        for (var i = 0; i < sidebarTreeChildrenCount; ++i) {
-            var treeElement = this.sidebarTree.children[i];
-            if (treeElement.children.length)
-                return;
-        }
+        if (!this._profilerEnabled || this._profilesWereRequested)
+            return;
 
         function populateCallback(profileHeaders) {
             profileHeaders.sort(function(a, b) { return a.uid - b.uid; });

-- 
WebKit Debian packaging