From bc4202544a807ee0a2437bb1de7162046354709e Mon Sep 17 00:00:00 2001
From: "tony@chromium.org"
 <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 6 Apr 2012 22:16:08 +0000
Subject: [PATCH] [chromium] Unreviewed, rebaseline a test on Vista/Win7.

* platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt: Removed.
* platform/chromium-win/fast/encoding/invalid-UTF-8-expected.png:
* platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt:
* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113504 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                                 |   9 +++++++++
 .../fast/encoding/invalid-UTF-8-expected.txt          |  15 ---------------
 .../fast/encoding/invalid-UTF-8-expected.png          | Bin 4819 -> 4722 bytes
 .../fast/encoding/invalid-UTF-8-expected.txt          |   8 ++++----
 LayoutTests/platform/chromium/test_expectations.txt   |   4 ++--
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 LayoutTests/platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae62156..9527543 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-06  Tony Chang  <tony@chromium.org>
+
+        [chromium] Unreviewed, rebaseline a test on Vista/Win7.
+
+        * platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt: Removed.
+        * platform/chromium-win/fast/encoding/invalid-UTF-8-expected.png:
+        * platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2012-04-06  Tom Sepez  <tsepez@chromium.org>
 
         Block cross-origin iframe scroll to fragment.
diff --git a/LayoutTests/platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt b/LayoutTests/platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt
deleted file mode 100644
index 5842698..0000000
--- a/LayoutTests/platform/chromium-linux/fast/encoding/invalid-UTF-8-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 313x19
-          text run at (0,0) width 313: "This tests the rendering of invalid UTF-8 sequences."
-      RenderBlock {P} at (0,36) size 784x20
-        RenderText {#text} at (0,0) size 475x19
-          text run at (0,0) width 475: "The output should be: \"\x{442}??\x{442}\" (with black diamonds in place of question marks)."
-      RenderBlock {HR} at (0,72) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,90) size 784x20
-        RenderText {#text} at (0,0) size 46x19
-          text run at (0,0) width 46: "\x{442}\x{FFFD}\x{FFFD}\x{442}"
diff --git a/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.png b/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.png
index ab42f74a282ec17970f78d05cb4ad9d6a47e038f..76a0e9a11ba74323fa75bc6a493b3924794dec5f 100644
GIT binary patch
literal 4722
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

literal 4819
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
KpyjjpZ~g@xg<h`!

diff --git a/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt b/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt
index 96cdd0f..5842698 100644
--- a/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/encoding/invalid-UTF-8-expected.txt
@@ -7,9 +7,9 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 313x19
           text run at (0,0) width 313: "This tests the rendering of invalid UTF-8 sequences."
       RenderBlock {P} at (0,36) size 784x20
-        RenderText {#text} at (0,0) size 500x19
-          text run at (0,0) width 500: "The output should be: \"\x{442}??\x{442} ???\" (with black diamonds in place of question marks)."
+        RenderText {#text} at (0,0) size 475x19
+          text run at (0,0) width 475: "The output should be: \"\x{442}??\x{442}\" (with black diamonds in place of question marks)."
       RenderBlock {HR} at (0,72) size 784x2 [border: (1px inset #000000)]
       RenderBlock {P} at (0,90) size 784x20
-        RenderText {#text} at (0,0) size 98x19
-          text run at (0,0) width 98: "\x{442}\x{FFFD}\x{FFFD}\x{442} \x{FFFD}\x{FFFD}\x{FFFD}"
+        RenderText {#text} at (0,0) size 46x19
+          text run at (0,0) width 46: "\x{442}\x{FFFD}\x{FFFD}\x{442}"
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7114ca8..8dbc7b1 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1334,8 +1334,8 @@ BUGCR24207 : fast/events/attempt-scroll-with-no-scrollbars.html = FAIL
 BUGWK79938 : fast/js/kde/RegExp.html = TEXT
 
 // No glyph for U+FFFD (Replacement Character : black diamond with
-// question mark) in them
-BUGCR10315 WIN : fast/encoding/invalid-UTF-8.html = IMAGE+TEXT
+// question mark) in them on Win XP.
+BUGCR10315 XP : fast/encoding/invalid-UTF-8.html = IMAGE+TEXT
 
 // v8: A setter that is added to a prototype after the inline cache is
 // recorded will not be called.
-- 
2.7.4