[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mnaganov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit da68231a03735b50fd0711d1aa0d4939131b9a02
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 12:24:03 2011 +0000

    works in chromium
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/inspector/cpu-profiler-profiling.html b/LayoutTests/inspector/cpu-profiler-profiling.html
index dd8cb79..0be6f6a 100644
--- a/LayoutTests/inspector/cpu-profiler-profiling.html
+++ b/LayoutTests/inspector/cpu-profiler-profiling.html
@@ -4,8 +4,10 @@
 <script>
 
 function pageFunction() {
-    console.profile();  // Make sure we capture the current callstack.
-    console.profileEnd();
+    console.profile("outer");
+    console.profile("inner");  // [Chromium] Make sure we capture the current callstack.
+    console.profileEnd("inner");
+    console.profileEnd("outer");
 }
 
 function initialize_ProfilerTests()
@@ -33,11 +35,35 @@ function initialize_ProfilerTests()
         InspectorTest.completeTest();
     }
 
+    var oldAddProfileHeader = WebInspector.panels.profiles._addProfileHeader;
+    WebInspector.panels.profiles._addProfileHeader = function(profile)
+    {
+        oldAddProfileHeader.call(this, profile);
+        if (profile.title === "inner") {
+            this.showProfile(profile);
+        }
+    }
+
     var oldRefresh = WebInspector.CPUProfileView.prototype.refresh;
     WebInspector.CPUProfileView.prototype.refresh = function()
     {
         oldRefresh.call(this);
-        InspectorTest.findPageFunctionProfileNode();       
+        if (this.profile.title === "inner") {
+            var tree = this.profileDataGridTree;
+            if (!tree)
+                 InspectorTest.addResult("no tree");
+            var node = tree.children[0];
+            if (!node)
+                 InspectorTest.addResult("no node");
+            while (node) {
+                if (node.functionName.indexOf("pageFunction") !== -1) {
+                    InspectorTest.addResult("found pageFunction");
+                    break;
+                }
+                node = node.traverseNextNode(true, null, true);
+            }
+            InspectorTest.completeTest();
+        }
     }
 }
 

-- 
WebKit Debian packaging