diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 20:07:39 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 20:07:39 +0000 |
| commit | dde6e35f3f0ecda0f8c7c5873ef04eb4877ee9f2 (patch) | |
| tree | fc620a2e93b5c92cb031d149a29576bddfa49617 /webkit | |
| parent | 2abb09cdd723f48acc54dac4d8dee1c5ae2771f7 (diff) | |
| download | chromium_src-dde6e35f3f0ecda0f8c7c5873ef04eb4877ee9f2.zip chromium_src-dde6e35f3f0ecda0f8c7c5873ef04eb4877ee9f2.tar.gz chromium_src-dde6e35f3f0ecda0f8c7c5873ef04eb4877ee9f2.tar.bz2 | |
Follow-up to r3444 (which forked http/tests/misc/frame-default-enc-same-domain.html until we pick up the
upstream fix). I forgot to move 'resources' directory.
Sorry for my stupid mistake (and not running the test after forking).
TBR=darin
Review URL: http://codereview.chromium.org/7448
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/data/layout_tests/pending/http/tests/misc/README.txt | 1 | ||||
| -rw-r--r-- | webkit/data/layout_tests/pending/http/tests/misc/resources/frame-default-enc-frame.html | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/pending/http/tests/misc/README.txt b/webkit/data/layout_tests/pending/http/tests/misc/README.txt index e9a7d20..44517c6b 100644 --- a/webkit/data/layout_tests/pending/http/tests/misc/README.txt +++ b/webkit/data/layout_tests/pending/http/tests/misc/README.txt @@ -1,4 +1,5 @@ frame-default-enc-same-domain.html +resources/frame-default-enc-frame.html ------------------------------------------- This test should be removed once the patch for webkit bug 21581 (https://bugs.webkit.org/show_bug.cgi?id=21581) is accepted in the upstream. diff --git a/webkit/data/layout_tests/pending/http/tests/misc/resources/frame-default-enc-frame.html b/webkit/data/layout_tests/pending/http/tests/misc/resources/frame-default-enc-frame.html new file mode 100644 index 0000000..5cd955a --- /dev/null +++ b/webkit/data/layout_tests/pending/http/tests/misc/resources/frame-default-enc-frame.html @@ -0,0 +1,17 @@ +<html> +<head> +<title>Frame</title> +</head> +<body> +<script> + chs = document.inputEncoding; + if (!chs) + chs = document.charset; + if (!chs) + chs = document.characterSet; + + alert(chs); +</script> + +</body> +</html> |