[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 01:55:42 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 5d5c0b98ac4936db1efd17a8cc1edbbee36637af
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 22:17:29 2010 +0000

    2010-02-22  Robert Hogan  <robert at roberthogan.net>
    
            Reviewed by Alexey Proskuryakov.
    
            https://bugs.webkit.org/show_bug.cgi?id=32937
            LayoutTests/fast/encoding/invalid-UTF-8.html fails on Qt.
    
            The test was verifying two things: first, that U+FFFD is rendered by the browser, and second,
            that ill-formed UTF-8 sequences are turned into U+FFFD. Some aspects of the latter are not
            precisely defined by the Unicode specification, so different platforms may legitimately
            have different results.
    
            Split the test into two: one to test the rendering of invalid UTF-8 sequences, and the other
            to protect against regressions in each platform's decoding behaviour.
    
            * fast/encoding/invalid-UTF-8-2-expected.txt: Added.
            * fast/encoding/invalid-UTF-8-2.html: Added.
            * fast/encoding/invalid-UTF-8.html:
            * platform/mac/fast/encoding/invalid-UTF-8-expected.checksum:
            * platform/mac/fast/encoding/invalid-UTF-8-expected.png:
            * platform/mac/fast/encoding/invalid-UTF-8-expected.txt:
            * platform/qt/fast/encoding/invalid-UTF-8-2-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 05309db..3ede518 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-02-22  Robert Hogan  <robert at roberthogan.net>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32937
+        LayoutTests/fast/encoding/invalid-UTF-8.html fails on Qt.
+
+        The test was verifying two things: first, that U+FFFD is rendered by the browser, and second,
+        that ill-formed UTF-8 sequences are turned into U+FFFD. Some aspects of the latter are not
+        precisely defined by the Unicode specification, so different platforms may legitimately
+        have different results.
+
+        Split the test into two: one to test the rendering of invalid UTF-8 sequences, and the other
+        to protect against regressions in each platform's decoding behaviour.
+
+        * fast/encoding/invalid-UTF-8-2-expected.txt: Added.
+        * fast/encoding/invalid-UTF-8-2.html: Added.
+        * fast/encoding/invalid-UTF-8.html:
+        * platform/mac/fast/encoding/invalid-UTF-8-expected.checksum:
+        * platform/mac/fast/encoding/invalid-UTF-8-expected.png:
+        * platform/mac/fast/encoding/invalid-UTF-8-expected.txt:
+        * platform/qt/fast/encoding/invalid-UTF-8-2-expected.txt:
+
 2010-02-22  Chris Fleizach  <cfleizach at apple.com>
 
         Fixing Layout test failure. Not reviewed.
diff --git a/LayoutTests/fast/encoding/invalid-UTF-8-2-expected.txt b/LayoutTests/fast/encoding/invalid-UTF-8-2-expected.txt
new file mode 100644
index 0000000..66c6f22
--- /dev/null
+++ b/LayoutTests/fast/encoding/invalid-UTF-8-2-expected.txt
@@ -0,0 +1,4 @@
+This tests the decoding of invalid UTF-8 sequences.
+
+The following should be: "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½" or "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½":
+Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½
diff --git a/LayoutTests/fast/encoding/invalid-UTF-8-2.html b/LayoutTests/fast/encoding/invalid-UTF-8-2.html
new file mode 100644
index 0000000..d6ddd94
--- /dev/null
+++ b/LayoutTests/fast/encoding/invalid-UTF-8-2.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style>
+/* Force font fallback on Windows to match Mac OS X */
+ at font-face {
+    font-family: 'times';
+    src: local('Lucida Grande');
+    unicode-range: U+FFFD;
+}
+</style>
+</head>
+<body>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+<p>This tests the decoding of invalid UTF-8 sequences.</p>
+The following should be: "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½" or "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½":
+<p>Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½</p>
+</body>
+</html>
+
diff --git a/LayoutTests/fast/encoding/invalid-UTF-8.html b/LayoutTests/fast/encoding/invalid-UTF-8.html
index f0a6f9e..ca8a9b1 100644
--- a/LayoutTests/fast/encoding/invalid-UTF-8.html
+++ b/LayoutTests/fast/encoding/invalid-UTF-8.html
@@ -12,8 +12,8 @@
 </head>
 <body>
 <p>This tests the rendering of invalid UTF-8 sequences.</p>
-<p>The output should be: "Ñ‚??Ñ‚ ???" (with black diamonds in place of question marks).</p>
+<p>The output should be: "Ñ‚??Ñ‚" (with black diamonds in place of question marks).</p>
 <hr>
-<p>Ñ‚µÑÑ‚ ð€ð€ð</p>
+<p>Ñ‚ï¿½ï¿½Ñ‚</p>
 </body>
 </html>
diff --git a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.checksum b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.checksum
index 0841aed..e9b6fc8 100644
--- a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.checksum
+++ b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.checksum
@@ -1 +1 @@
-3ca8bdfc2bb27d8b9b4f0c5b7987c307
\ No newline at end of file
+c779f652f566414b3c173c80f30ed567
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png
index d556f01..0844340 100644
Binary files a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png and b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.txt b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.txt
index 0573006..2075571 100644
--- a/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.txt
+++ b/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.txt
@@ -7,9 +7,9 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 330x18
           text run at (0,0) width 330: "This tests the rendering of invalid UTF-8 sequences."
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 527x18
-          text run at (0,0) width 527: "The output should be: \"\x{442}??\x{442} ???\" (with black diamonds in place of question marks)."
+        RenderText {#text} at (0,0) size 502x18
+          text run at (0,0) width 502: "The output should be: \"\x{442}??\x{442}\" (with black diamonds in place of question marks)."
       RenderBlock {HR} at (0,68) size 784x2 [border: (1px inset #000000)]
       RenderBlock {P} at (0,86) size 784x19
-        RenderText {#text} at (0,1) size 98x18
-          text run at (0,1) width 98: "\x{442}\x{FFFD}\x{FFFD}\x{442} \x{FFFD}\x{FFFD}\x{FFFD}"
+        RenderText {#text} at (0,1) size 46x18
+          text run at (0,1) width 46: "\x{442}\x{FFFD}\x{FFFD}\x{442}"
diff --git a/LayoutTests/platform/qt/fast/encoding/invalid-UTF-8-2-expected.txt b/LayoutTests/platform/qt/fast/encoding/invalid-UTF-8-2-expected.txt
new file mode 100644
index 0000000..f379dc4
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/encoding/invalid-UTF-8-2-expected.txt
@@ -0,0 +1,4 @@
+This tests the decoding of invalid UTF-8 sequences.
+
+The following should be: "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½" or "Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½":
+Ñ‚ï¿½ï¿½Ñ‚ ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½

-- 
WebKit Debian packaging

