2009-02-04 Dmitry Titov <dimich@chromium.org>
authordglazkov@chromium.org <dglazkov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Feb 2009 04:07:17 +0000 (04:07 +0000)
committerdglazkov@chromium.org <dglazkov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Feb 2009 04:07:17 +0000 (04:07 +0000)
        Not reviewed, build fix.

        https://bugs.webkit.org/show_bug.cgi?id=22806
        Reverting the test that should not yet be landed since it depends on
        changes in DRT which were not yet landed.

        * fast/dom/Window/cached-timeout-stopped-on-close-expected.txt: Removed.
        * fast/dom/Window/cached-timeout-stopped-on-close.html: Removed.
        * fast/dom/Window/resources/cached-timeout-page-1.html: Removed.
        * fast/dom/Window/resources/cached-timeout-page-2.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close-expected.txt [deleted file]
LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close.html [deleted file]
LayoutTests/fast/dom/Window/resources/cached-timeout-page-1.html [deleted file]
LayoutTests/fast/dom/Window/resources/cached-timeout-page-2.html [deleted file]

index 9ab3864f2e4151959a96c4fffeb1957e2b2d6826..4c16b273c50e46296255d21e1f95b683717467b5 100644 (file)
@@ -1,3 +1,16 @@
+2009-02-04  Dmitry Titov  <dimich@chromium.org>
+
+        Not reviewed, build fix.
+
+        https://bugs.webkit.org/show_bug.cgi?id=22806
+        Reverting the test that should not yet be landed since it depends on
+        changes in DRT which were not yet landed.
+
+        * fast/dom/Window/cached-timeout-stopped-on-close-expected.txt: Removed.
+        * fast/dom/Window/cached-timeout-stopped-on-close.html: Removed.
+        * fast/dom/Window/resources/cached-timeout-page-1.html: Removed.
+        * fast/dom/Window/resources/cached-timeout-page-2.html: Removed.
+
 2009-02-04  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close-expected.txt b/LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close-expected.txt
deleted file mode 100644 (file)
index 7f1bb38..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a test for bug 22753. This test verifies that if a page with non-expired timeout is pushed into the page cache and then a window is closed, the resulting cache purge will stop the timer. Stopping the timer releases the JS global object. If bug is not fixed, JS global object and all the objects it holds onto are not released and memory leak occurs.
-Test is passed if you see "PASS" below. This test can only run in DumpRenderTree since it needs access to GCController.
-
-PASS
diff --git a/LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close.html b/LayoutTests/fast/dom/Window/cached-timeout-stopped-on-close.html
deleted file mode 100644 (file)
index 9f5d682..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<script>
-var objectCount = 0;
-
-function finish()
-{
-    GCController.collect();
-    var remainingObjects = GCController.getJSObjectCount() - objectCount;
-    // The leaked page allocates 1000 strings. They should be gone.
-    document.getElementById("result").innerText = 
-        (remainingObjects < 1000 ? "PASS" : "FAIL");
-    layoutTestController.notifyDone();
-}
-
-function scheduleFinish()
-{
-    // Note: the timeout here must be more then 10ms to ensure that this timeout will
-    // expire after an internal one which releases cached pages.
-    window.setTimeout(finish, 100);
-}
-function test()
-{
-    if (!window.layoutTestController || !GCController) {
-        document.getElementById("result").innerText = "FAIL: this test can only run in DumpRenderTree.";
-        return;
-    }
-
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-    layoutTestController.setCanOpenWindows();
-    layoutTestController.overridePreference("UsesPageCache", true);
-
-    GCController.collect();
-    objectCount = GCController.getJSObjectCount();
-    // The page in this new window will change its location (to place itself in the page cache),
-    // call scheduleFinish() on this page and then close itself. Shortly thereafter, the page cache
-    // should be released and JS object count reduced.
-    window.open("resources/cached-timeout-page-1.html");
-}
-</script>
-<body onload="test()">
-<p>This is a test for bug <a href="https://bugs.webkit.org/show_bug.cgi?id=22753">22753</a>.
-This test verifies that if a page with non-expired timeout is pushed into the page cache and then
-a window is closed, the resulting cache purge will stop the timer. Stopping the timer releases the
-JS global object. If bug is not fixed, JS global object and all the objects it holds onto are not released
-and memory leak occurs.<br>Test is passed if you see "PASS" below. This test can only run in DumpRenderTree
-since it needs access to GCController.
-<div id="result">FAIL</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/dom/Window/resources/cached-timeout-page-1.html b/LayoutTests/fast/dom/Window/resources/cached-timeout-page-1.html
deleted file mode 100644 (file)
index cbe4865..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<script>
-
-// This makes document referenced by the global object (window).
-// If the bug 22753 wasn't fixed, there would be circular reference
-// timer->JSFunction->JSDOMWindow->Document->timer, and refcount
-// on the Document wouldn't go to 0.
-var doc = document;
-
-var stuff = new Array;
-function loadNext()
-{
-    // Allocate a lot so the mem leak is easy to detect.
-    // Some other factors (running DumpRenderTree --threading) could cause
-    // other JS objects to be allocated, but not so much.
-    for(i = 0; i < 1000; i++)
-        stuff[i] = new String("abc");
-
-    setInterval(function fooo() {}, 1000);
-
-    location.href = "cached-timeout-page-2.html";
-}
-</script>
-<body onload="loadNext()">
-</body>
\ No newline at end of file
diff --git a/LayoutTests/fast/dom/Window/resources/cached-timeout-page-2.html b/LayoutTests/fast/dom/Window/resources/cached-timeout-page-2.html
deleted file mode 100644 (file)
index 93a0e9c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<body onload="window.opener.scheduleFinish(); window.close()">
-</body>
\ No newline at end of file