diff options
| author | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 22:52:09 +0000 |
|---|---|---|
| committer | pam@chromium.org <pam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 22:52:09 +0000 |
| commit | 98d9e2d62e8313915dc112d10899c2dc48e4845c (patch) | |
| tree | ee4fe15caace7a6e8a893b5b52ec421fbcfc5269 /webkit | |
| parent | 20f5c6c9d2d78044025989f86bb22b8d6d6a0a84 (diff) | |
| download | chromium_src-98d9e2d62e8313915dc112d10899c2dc48e4845c.zip chromium_src-98d9e2d62e8313915dc112d10899c2dc48e4845c.tar.gz chromium_src-98d9e2d62e8313915dc112d10899c2dc48e4845c.tar.bz2 | |
Remove some tests that have been sent upstream and brought back down in WebKit.
These were split into various fast/dom/Window/Location/ tests.
BUG=4391
TEST=covered by layout tests
Review URL: http://codereview.chromium.org/63094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
7 files changed, 0 insertions, 221 deletions
diff --git a/webkit/data/layout_tests/chrome/fast/dom/location-shadowing-expected.txt b/webkit/data/layout_tests/chrome/fast/dom/location-shadowing-expected.txt deleted file mode 100644 index ee1e22ff..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/location-shadowing-expected.txt +++ /dev/null @@ -1,14 +0,0 @@ -This tests that the location property on the window object cannot be shadowed by using 'var' declarations or accessors defined using __defineGetter__ and __defineSetter__ and that functions on location objects are read-only. - -PASS -PASS -PASS -PASS -PASS -PASS -PASS -PASS -PASS -PASS -PASS - diff --git a/webkit/data/layout_tests/chrome/fast/dom/location-shadowing.html b/webkit/data/layout_tests/chrome/fast/dom/location-shadowing.html deleted file mode 100644 index 1b5c0aa..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/location-shadowing.html +++ /dev/null @@ -1,85 +0,0 @@ -<html> -<body onload="test()"> -<div id="result"> -<p> -This tests that the location property on the window object cannot be -shadowed by using 'var' declarations or accessors defined using -__defineGetter__ and __defineSetter__ and that functions on location -objects are read-only. -</p> -</div> -<iframe id="testFrame"></iframe> -<script> -if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); -} - -function notifyDone() { - if (window.layoutTestController) { - layoutTestController.notifyDone(); - } -} - -var resultDiv = document.getElementById("result"); - -function check(passed) { - if (passed) { - resultDiv.innerHTML += "PASS<br>"; - } else { - resultDiv.innerHTML += "FAIL<br>"; - } -} - -var locationFunctions = ["reload", "replace", "assign", "toString", "valueOf"]; - -function overwrite() { return 'overwrite'; }; - -function testFunctionOverwrite() { - for (var i = 0; i < locationFunctions.length; i++) { - location[locationFunctions[i]] = overwrite; - check(location[locationFunctions[i]] != overwrite); - delete location[locationFunctions[i]]; - location[locationFunctions[i]] = overwrite; - check(location[locationFunctions[i]] != overwrite); - location.__defineGetter__(locationFunctions[i], failIfCalled); - location[locationFunctions[i]]; - } -} - -function failIfCalled() { check(false); } - -function testAccessorOverwrite() { - __defineGetter__("location", failIfCalled); - location; - window.__defineGetter__("location", failIfCalled); - window.location; - this.__defineGetter__("location", failIfCalled); - this.location; - delete location; - __defineGetter__("location", failIfCalled); - location; -} - - -function testHrefOverwrite() { - location.__defineGetter__("href", failIfCalled); - location.href; - delete location.href; - location.__defineGetter__("href", failIfCalled); - location.href; -} - -function testVarShadowing() { - testFrame.location = "resources/location-shadowing-inner.html"; -} - -function test() { - testFunctionOverwrite(); - testAccessorOverwrite(); - testHrefOverwrite(); - testVarShadowing(); -} -</script> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner.html b/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner.html deleted file mode 100644 index df2a4ac..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner.html +++ /dev/null @@ -1,8 +0,0 @@ -<html> -<body> -location-shadowing-inner -<script> -var location = "location-shadowing-inner2.html"; -</script> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner2.html b/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner2.html deleted file mode 100644 index ce00a5c..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/resources/location-shadowing-inner2.html +++ /dev/null @@ -1,11 +0,0 @@ -<html> -<body onload="load()"> -location-shadowing-inner2 -<script> -function load() { - top.check(true); - top.notifyDone(); -} -</script> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/dom/resources/window-shadowing-inner.html b/webkit/data/layout_tests/chrome/fast/dom/resources/window-shadowing-inner.html deleted file mode 100644 index 9b7cced..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/resources/window-shadowing-inner.html +++ /dev/null @@ -1,12 +0,0 @@ -<html> -<body> -<script> -var overwrite = {}; -var window = overwrite; -top.check(window != overwrite); -var top = overwrite; -top.check(top != overwrite); -top.notifyDone(); -</script> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/dom/window-shadowing-expected.txt b/webkit/data/layout_tests/chrome/fast/dom/window-shadowing-expected.txt deleted file mode 100644 index c7483a3..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/window-shadowing-expected.txt +++ /dev/null @@ -1,5 +0,0 @@ -Test that the window and top attributes cannot be overwritten by var declarations or accessors defined using __defineGetter__ and __defineSetter__. Flash accesses top.location and window.location and for security needs to see the actual location. - -PASS -PASS - diff --git a/webkit/data/layout_tests/chrome/fast/dom/window-shadowing.html b/webkit/data/layout_tests/chrome/fast/dom/window-shadowing.html deleted file mode 100644 index fa5bab7..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/window-shadowing.html +++ /dev/null @@ -1,86 +0,0 @@ -<html> -<body onload="test()"> -<div id='result'> -<p> -Test that the window and top attributes cannot be overwritten by var -declarations or accessors defined using __defineGetter__ and -__defineSetter__. Flash accesses top.location and window.location and -for security needs to see the actual location. -</p> -</div> -<iframe id="testFrame"></iframe> -<script> -if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); -} - -function notifyDone() { - if (window.layoutTestController) { - layoutTestController.notifyDone(); - } -} - -var resultDiv = document.getElementById("result"); - -function check(passed) { - if (passed) { - resultDiv.innerHTML += "PASS<br>"; - } else { - resultDiv.innerHTML += "FAIL<br>"; - } -} - -var overwrite = { location: 'ick' }; - -function failIfCalled() { check(false); } - -function testWindowAccessorOverwrite() { - __defineGetter__("window", failIfCalled); - window; - window.__defineGetter__("window", failIfCalled); - window.window; - this.__defineGetter__("window", failIfCalled); - this.window; - __defineSetter__("window", failIfCalled); - window = overwrite; - window.__defineSetter__("window", failIfCalled); - window.window = overwrite; - this.__defineSetter__("window", failIfCalled); - this.window = overwrite; - delete window; - __defineGetter__("window", failIfCalled); - window; -} - -function testTopAccessorOverwrite() { - __defineGetter__("top", failIfCalled); - top; - window.__defineGetter__("top", failIfCalled); - window.top; - this.__defineGetter__("top", failIfCalled); - this.top; - __defineSetter__("top", failIfCalled); - top = overwrite; - window.__defineSetter__("top", failIfCalled); - window.top = overwrite; - this.__defineSetter__("top", failIfCalled); - this.top = overwrite; - delete top; - __defineGetter__("top", failIfCalled); - top; - -} - -function testVarShadowing() { - testFrame.location = "resources/window-shadowing-inner.html"; -} - -function test() { - testWindowAccessorOverwrite(); - testTopAccessorOverwrite(); - testVarShadowing(); -} -</script> -</body> -</html> |