[webkit-changes] cvs commit: LayoutTests/fast/encoding/resources frame-default-enc-frame.html

Fri Dec 23 00:28:45 PST 2005

ap          05/12/23 00:28:44

  Added:       fast/encoding frame-default-enc-expected.checksum
                        frame-default-enc-expected.png
                        frame-default-enc-expected.txt
                        frame-default-enc.html
               fast/encoding/resources frame-default-enc-frame.html
  Log:
          Reviewed by Darin Adler.

          - 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.

  Revision  Changes    Path
  1.1                  LayoutTests/fast/encoding/frame-default-enc-expected.checksum

  Index: frame-default-enc-expected.checksum
  ===================================================================
  ea30b7b2b94e5ffb2c4bd4ea61c75bea

  1.1                  LayoutTests/fast/encoding/frame-default-enc-expected.png

  	<<Binary file>>

  1.1                  LayoutTests/fast/encoding/frame-default-enc-expected.txt

  Index: frame-default-enc-expected.txt
  ===================================================================
  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."

  1.1                  LayoutTests/fast/encoding/frame-default-enc.html

  Index: frame-default-enc.html
  ===================================================================
  <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>

  1.1                  LayoutTests/fast/encoding/resources/frame-default-enc-frame.html

  Index: frame-default-enc-frame.html
  ===================================================================
  <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>