diff options
| author | cwzwarich@webkit.org <cwzwarich@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2008-12-12 07:28:27 +0000 |
|---|---|---|
| committer | cwzwarich@webkit.org <cwzwarich@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2008-12-12 07:28:27 +0000 |
| commit | f7a607ecd51fd310d3156008d16ce707568f37bf (patch) | |
| tree | 798ab6e5e013b8df385e04c244ca22aff674cb23 /third_party/WebKit/LayoutTests/security | |
| parent | 073e8559d00ca4f8b5623a0d4e457f007a3ea62a (diff) | |
| download | chromium_src-f7a607ecd51fd310d3156008d16ce707568f37bf.zip chromium_src-f7a607ecd51fd310d3156008d16ce707568f37bf.tar.gz chromium_src-f7a607ecd51fd310d3156008d16ce707568f37bf.tar.bz2 | |
2008-12-11 Cameron Zwarich <zwarich@apple.com>
Rubber-stamped by Mark Rowe.
Roll out r39212 due to assertion failures during layout tests, multiple
layout test failures, memory leaks, and obvious incorrectness.
WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(-[WebPreferences fullDocumentTeardownEnabled]):
* WebView/WebPreferencesPrivate.h:
WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
* WebPreferences.h:
WebKitTools:
* DumpRenderTree/LayoutTestController.cpp:
(LayoutTestController::staticFunctions):
* DumpRenderTree/LayoutTestController.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebViewToConsistentStateBeforeTesting):
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebViewToConsistentStateBeforeTesting):
* DumpRenderTree/win/LayoutTestControllerWin.cpp:
(LayoutTestController::pauseTransitionAtTimeOnElementWithId):
LayoutTests:
* security/override-preferences-2-expected.txt: Removed.
* security/override-preferences-2.html: Removed.
* security/override-preferences-expected.txt: Removed.
* security/override-preferences.html: Removed.
* security/override-zzz-reset-expected.txt: Removed.
* security/override-zzz-reset.html: Removed.
git-svn-id: svn://svn.chromium.org/blink/trunk@39227 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/security')
6 files changed, 0 insertions, 59 deletions
diff --git a/third_party/WebKit/LayoutTests/security/override-preferences-2-expected.txt b/third_party/WebKit/LayoutTests/security/override-preferences-2-expected.txt deleted file mode 100644 index abcceaa..0000000 --- a/third_party/WebKit/LayoutTests/security/override-preferences-2-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -This test verifies that layoutTestController can have its default preferences overriden. This test verifies that the API will accept string values and also override the default font size. You should see "PASS" below. - -PASS diff --git a/third_party/WebKit/LayoutTests/security/override-preferences-2.html b/third_party/WebKit/LayoutTests/security/override-preferences-2.html deleted file mode 100644 index 23056f4..0000000 --- a/third_party/WebKit/LayoutTests/security/override-preferences-2.html +++ /dev/null @@ -1,18 +0,0 @@ -<html> -<script> - if(window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.overridePreference("WebKitDefaultFontSize", "24"); - } -</script> -<body> - <p>This test verifies that layoutTestController can have its default preferences overriden. - This test verifies that the API will accept string values and also override the default font size. - You should see "PASS" below.</p> - <script> - var p = document.getElementsByTagName("p")[0]; - if(!window.layoutTestController || window.getComputedStyle(p).fontSize == "24px") - document.write("PASS"); - </script> -</body> -</html> diff --git a/third_party/WebKit/LayoutTests/security/override-preferences-expected.txt b/third_party/WebKit/LayoutTests/security/override-preferences-expected.txt deleted file mode 100644 index 4c348e0..0000000 --- a/third_party/WebKit/LayoutTests/security/override-preferences-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is a test that verifies that layoutTestController can have its default preferences overridden. This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser. - -PASS diff --git a/third_party/WebKit/LayoutTests/security/override-preferences.html b/third_party/WebKit/LayoutTests/security/override-preferences.html deleted file mode 100644 index 740a739..0000000 --- a/third_party/WebKit/LayoutTests/security/override-preferences.html +++ /dev/null @@ -1,18 +0,0 @@ -<html> -<body> -<script> - if(window.layoutTestController) { - layoutTestController.dumpAsText() - layoutTestController.overridePreference("WebKitJavaScriptEnabled", false); - } - - function loadstatus() { - if(window.layoutTestController) - document.getElementById("status").innerHTML="FAIL"; - } -</script> -<body onload="loadstatus()"> - <p>This is a test that verifies that layoutTestController can have its default preferences overridden. This test specifically checks that Javascript can be disabled, and you should see "PASS" below if viewing with a browser.</p> - <span id="status">PASS</span> -</body> -</html> diff --git a/third_party/WebKit/LayoutTests/security/override-zzz-reset-expected.txt b/third_party/WebKit/LayoutTests/security/override-zzz-reset-expected.txt deleted file mode 100644 index dee292e..0000000 --- a/third_party/WebKit/LayoutTests/security/override-zzz-reset-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -This test verifies that the layoutTestController will reset its default preferences after every layout test. You should see "PASS" below. - -PASS diff --git a/third_party/WebKit/LayoutTests/security/override-zzz-reset.html b/third_party/WebKit/LayoutTests/security/override-zzz-reset.html deleted file mode 100644 index cbeb1e0..0000000 --- a/third_party/WebKit/LayoutTests/security/override-zzz-reset.html +++ /dev/null @@ -1,14 +0,0 @@ -<html> -<body> -<script> - if(window.layoutTestController) - layoutTestController.dumpAsText(); -</script> -<body> - <p>This test verifies that the layoutTestController will reset its default preferences after every layout test. You should see "PASS" below.</p> - <span id="status">FAIL</span> - <script> - document.getElementById("status").innerHTML="PASS"; - </script> -</body> -</html> |