summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/pending/http/tests/misc/README.txt1
-rw-r--r--webkit/data/layout_tests/pending/http/tests/misc/resources/frame-default-enc-frame.html17
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>