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

Sun Feb 20 23:15:43 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit 74b64b50020e992e81a188b54b06d34b44d92762
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 13:27:54 2011 +0000

    Revert "2011-01-18  Mikhail Naganov  <mnaganov at chromium.org>"
    
    Revert r76114 -- added test fails on Chromium canaries.
    
    This reverts commit 89065aef21411b68af89a8fa7ff41dfe14c54a6a.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76117 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c68a6fb..f8a4d7a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-19  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Revert r76114 -- added test fails on Chromium canaries.
+
 2011-01-19  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/inspector/cpu-profiler-profiling-expected.txt b/LayoutTests/inspector/cpu-profiler-profiling-expected.txt
deleted file mode 100644
index aaccc62..0000000
--- a/LayoutTests/inspector/cpu-profiler-profiling-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Tests that CPU profiling works. Bug 52634.
-
-found pageFunction
-
diff --git a/LayoutTests/inspector/cpu-profiler-profiling.html b/LayoutTests/inspector/cpu-profiler-profiling.html
deleted file mode 100644
index c0b0671..0000000
--- a/LayoutTests/inspector/cpu-profiler-profiling.html
+++ /dev/null
@@ -1,67 +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()
-{
-    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.
-
-<a href="https://bugs.webkit.org/show_bug.cgi?id=52634">Bug 52634.</a>
-</p>
-</body>
-</html>

-- 
WebKit Debian packaging

