summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 01:44:46 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 01:44:46 +0000
commit4fc4601fb2542e0c4a764ff7b8e7451c88a061dc (patch)
tree07df1da9dd8bba9c8f333c96d4373ccbc73e966d /webkit/data
parent368736fe079a8898425107b0fa3981f6586ce41e (diff)
downloadchromium_src-4fc4601fb2542e0c4a764ff7b8e7451c88a061dc.zip
chromium_src-4fc4601fb2542e0c4a764ff7b8e7451c88a061dc.tar.gz
chromium_src-4fc4601fb2542e0c4a764ff7b8e7451c88a061dc.tar.bz2
Fork layout_tests\pending\http\tests\misc\frame-default-enc-same-domain.html
for now until we pick up the upstream change. (see what's about to be landed in Webkit trunk at http://bugs.webkit.org/show_bug.cgi?id=21581) TEST=pass pending/http/tests/misc/frame-default-enc-same-domain.html Review URL: http://codereview.chromium.org/7339 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/pending/http/tests/misc/README.txt4
-rw-r--r--webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain-expected.txt1
-rw-r--r--webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain.html14
3 files changed, 19 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
new file mode 100644
index 0000000..e9a7d20
--- /dev/null
+++ b/webkit/data/layout_tests/pending/http/tests/misc/README.txt
@@ -0,0 +1,4 @@
+frame-default-enc-same-domain.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/frame-default-enc-same-domain-expected.txt b/webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain-expected.txt
new file mode 100644
index 0000000..d1ab9e3
--- /dev/null
+++ b/webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain-expected.txt
@@ -0,0 +1 @@
+ALERT: windows-1256
diff --git a/webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain.html b/webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain.html
new file mode 100644
index 0000000..5ef955a
--- /dev/null
+++ b/webkit/data/layout_tests/pending/http/tests/misc/frame-default-enc-same-domain.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=windows-1256">
+<title>Frames and encodings</title>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</head>
+<frameset rows="0,*">
+ <frame src="about:" scrolling=no marginwidth=0 marginheight=0>
+ <frame src="resources/frame-default-enc-frame.html">
+</frameset>
+</html>