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

mnaganov at chromium.org mnaganov at chromium.org
Sun Feb 20 23:15:08 UTC 2011


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

    Revert accidental r76110..76112
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/inspector/cpu-profiler-profiling-expected.txt b/LayoutTests/inspector/cpu-profiler-profiling-expected.txt
deleted file mode 100644
index 40276bc..0000000
--- a/LayoutTests/inspector/cpu-profiler-profiling-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Tests that CPU profiling works.
-
-found pageFunction
-
diff --git a/LayoutTests/inspector/cpu-profiler-profiling.html b/LayoutTests/inspector/cpu-profiler-profiling.html
deleted file mode 100644
index 0be6f6a..0000000
--- a/LayoutTests/inspector/cpu-profiler-profiling.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-  <script src="../http/tests/inspector/inspector-test2.js"></script>
-<script>
-
-function pageFunction() {
-    console.profile("outer");
-    console.profile("inner");  // [Chromium] Make sure we capture the current callstack.
-    console.profileEnd("inner");
-    console.profileEnd("outer");
-}
-
-function initialize_ProfilerTests()
-{
-    InspectorTest.findPageFunctionProfileNode = function() {
-        var panel = WebInspector.panels.profiles;
-        if (!panel)
-             InspectorTest.addResult("no panel");
-        var view = panel.visibleView;
-        if (!view)
-             InspectorTest.addResult("no view");
-        var tree = view.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();
-    }
-
-    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);
-        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();
-        }
-    }
-}
-
-function test()
-{
-    WebInspector.showPanel("profiles");
-    WebInspector.panels.profiles._enableProfiling();
-    InspectorBackend.startProfiling();
-    InspectorTest.evaluateInConsole("pageFunction()", function done()
-    {
-        InspectorBackend.stopProfiling();
-    });
-}
-
-</script>
-</head>
-<body onload="runTest()">
-<p>
-Tests that CPU profiling works.
-</p>
-</body>
-</html>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list