Reviewed by Darin Adler.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Dec 2005 08:28:44 +0000 (08:28 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Dec 2005 08:28:44 +0000 (08:28 +0000)
        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6118
        Investigate not using the frameset charset as a default for frames

        * fast/encoding/frame-default-enc-expected.checksum: Added.
        * fast/encoding/frame-default-enc-expected.png: Added.
        * fast/encoding/frame-default-enc-expected.txt: Added.
        * fast/encoding/frame-default-enc.html: Added.
        * fast/encoding/resources/frame-default-enc-frame.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@11746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/fast/encoding/frame-default-enc-expected.checksum [new file with mode: 0644]
LayoutTests/fast/encoding/frame-default-enc-expected.png [new file with mode: 0644]
LayoutTests/fast/encoding/frame-default-enc-expected.txt [new file with mode: 0644]
LayoutTests/fast/encoding/frame-default-enc.html [new file with mode: 0644]
LayoutTests/fast/encoding/resources/frame-default-enc-frame.html [new file with mode: 0644]

diff --git a/LayoutTests/fast/encoding/frame-default-enc-expected.checksum b/LayoutTests/fast/encoding/frame-default-enc-expected.checksum
new file mode 100644 (file)
index 0000000..b0233e5
--- /dev/null
@@ -0,0 +1 @@
+ea30b7b2b94e5ffb2c4bd4ea61c75bea
\ No newline at end of file
diff --git a/LayoutTests/fast/encoding/frame-default-enc-expected.png b/LayoutTests/fast/encoding/frame-default-enc-expected.png
new file mode 100644 (file)
index 0000000..7989812
Binary files /dev/null and b/LayoutTests/fast/encoding/frame-default-enc-expected.png differ
diff --git a/LayoutTests/fast/encoding/frame-default-enc-expected.txt b/LayoutTests/fast/encoding/frame-default-enc-expected.txt
new file mode 100644 (file)
index 0000000..bf1c2d8
--- /dev/null
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderFrameSet {FRAMESET} at (0,0) size 800x600
+      RenderFrame {FRAME} at (0,0) size 800x0
+        layer at (0,0) size 798x0
+          RenderCanvas at (0,0) size 798x-4
+        layer at (0,0) size 798x0
+          RenderBlock {HTML} at (0,0) size 798x0
+            RenderBody {BODY} at (0,0) size 798x0
+      RenderFrame {FRAME} at (0,4) size 800x596
+        layer at (0,0) size 798x592
+          RenderCanvas at (0,0) size 798x592
+        layer at (0,0) size 798x592
+          RenderBlock {HTML} at (0,0) size 798x592
+            RenderBody {BODY} at (8,8) size 782x568
+              RenderBlock (anonymous) at (0,0) size 782x18
+                RenderText {TEXT} at (0,0) size 76x18
+                  text run at (0,0) width 76: "ISO-8859-1"
+              RenderBlock {P} at (0,34) size 782x18
+                RenderText {TEXT} at (0,0) size 515x18
+                  text run at (0,0) width 515: "The above line should be your browser's default encoding, and not x-mac-cyrillic."
diff --git a/LayoutTests/fast/encoding/frame-default-enc.html b/LayoutTests/fast/encoding/frame-default-enc.html
new file mode 100644 (file)
index 0000000..a495578
--- /dev/null
@@ -0,0 +1,10 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=x-mac-cyrillic">
+<title>Frames and encodings</title>
+</head>
+<frameset rows="0,*">
+       <frame src="about:" scrolling=no marginwidth=0 marginheight=0>
+       <frame src="resources/frame-default-enc-frame.html">
+</frameset>
+</html>
diff --git a/LayoutTests/fast/encoding/resources/frame-default-enc-frame.html b/LayoutTests/fast/encoding/resources/frame-default-enc-frame.html
new file mode 100644 (file)
index 0000000..224045b
--- /dev/null
@@ -0,0 +1,24 @@
+<html>
+<head>
+<title>Frame</title>
+</head>
+<body>
+<script>
+// Otherwise, DumpRenderTree prints empty output, for whatever reason.
+//  if (window.layoutTestController)
+//      layoutTestController.dumpAsText();
+
+chs = document.inputEncoding;
+if (!chs)
+       chs = document.charset;
+if (!chs)
+       chs = document.characterSet;
+
+document.write(chs);
+</script>
+
+<p>The above line should be your browser's default encoding, and not x-mac-cyrillic.</p>
+<!-- It's unlikely that anyone has x-mac-cyrillic as default -->
+
+<body>
+</html>