[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[jberlin at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9e0f932f94c1ca2256780f7d4f6130094ec3065f
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 02:16:33 2009 +0000

    Fix expanding profile call stacks being broken after sorting.
    https://bugs.webkit.org/show_bug.cgi?id=26423
    
    Patch by Jessie Berlin <jberlin at webkit.org> on 2009-09-24
    Reviewed by Timothy Hatcher.
    
    * inspector/front-end/ProfileDataGridTree.js:
    (WebInspector.ProfileDataGridNode.prototype.sort):
    Set shouldRefreshChildren to true on collapsed nodes with children so that expanding it
    causes the children to be placed in the right positions.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 501a1f5..57bb760 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-24  Jessie Berlin  <jberlin at webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Fix expanding profile call stacks being broken after sorting.
+        https://bugs.webkit.org/show_bug.cgi?id=26423
+
+        * inspector/front-end/ProfileDataGridTree.js:
+        (WebInspector.ProfileDataGridNode.prototype.sort):
+        Set shouldRefreshChildren to true on collapsed nodes with children so that expanding it
+        causes the children to be placed in the right positions.
+
 2009-09-24  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Stephanie Lewis.
diff --git a/WebCore/inspector/front-end/ProfileDataGridTree.js b/WebCore/inspector/front-end/ProfileDataGridTree.js
index 356f57d..3fb0e00 100644
--- a/WebCore/inspector/front-end/ProfileDataGridTree.js
+++ b/WebCore/inspector/front-end/ProfileDataGridTree.js
@@ -153,8 +153,11 @@ WebInspector.ProfileDataGridNode.prototype = {
 
                 // If the grid node is collapsed, then don't sort children (save operation for later).
                 // If the grid node has the same sorting as previously, then there is no point in sorting it again.
-                if (!force && !gridNode.expanded || gridNode.lastComparator === comparator)
+                if (!force && !gridNode.expanded || gridNode.lastComparator === comparator) {
+                    if (gridNode.children.length)
+                        gridNode.shouldRefreshChildren = true;
                     continue;
+                }
 
                 gridNode.lastComparator = comparator;
 

-- 
WebKit Debian packaging