Rebaseline fast/text/atsui-spacing-features.html

TBR=dpranke
TEST=none
BUG=10430

Review URL: http://codereview.chromium.org/551014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36155 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 84 insertions, 2 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.checksum
new file mode 100644
index 0000000..58c93c4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.checksum
@@ -0,0 +1 @@
+2706adb59ad8f3ddc9248fcb2ef3093d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.png
new file mode 100644
index 0000000..06a9cb2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.txt
new file mode 100644
index 0000000..d389e4c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/atsui-spacing-features-expected.txt
@@ -0,0 +1,82 @@
+layer at (0,0) size 13731x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 13731x340
+  RenderBlock {HTML} at (0,0) size 800x340
+    RenderBody {BODY} at (8,16) size 784x316
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 167x19
+          text run at (0,0) width 167: "Test for regressions against "
+        RenderInline {I} at (0,0) size 757x39
+          RenderInline {A} at (0,0) size 350x19 [color=#0000EE]
+            RenderText {#text} at (167,0) size 350x19
+              text run at (167,0) width 350: "http://bugzilla.opendarwin.org/show_bug.cgi?id=3922"
+          RenderText {#text} at (517,0) size 757x39
+            text run at (517,0) width 240: " Variable word/letter spacing and full"
+            text run at (0,20) width 332: "justification not supported for ATSUI-rendered text"
+        RenderText {#text} at (332,20) size 4x19
+          text run at (332,20) width 4: "."
+      RenderBlock (anonymous) at (0,56) size 784x20
+        RenderText {#text} at (0,0) size 483x19
+          text run at (0,0) width 483: "Each green box should be identical to the blue box it follows, except for accents."
+      RenderBlock {HR} at (0,84) size 784x2 [border: (1px inset #000000)]
+      RenderTable {TABLE} at (0,94) size 620x222
+        RenderTableSection {TBODY} at (0,0) size 620x222
+          RenderTableRow {TR} at (0,2) size 620x22
+            RenderTableCell {TD} at (2,2) size 204x22 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (59,1) size 85x19
+                text run at (59,1) width 85: "Word spacing"
+            RenderTableCell {TD} at (208,2) size 204x22 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (59,1) size 85x19
+                text run at (59,1) width 85: "Letter spacing"
+            RenderTableCell {TD} at (414,2) size 204x22 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (67,1) size 69x19
+                text run at (67,1) width 69: "Justification"
+          RenderTableRow {TR} at (0,26) size 620x194
+            RenderTableCell {TD} at (2,26) size 204x174 [r=1 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 202x172
+                RenderBlock {DIV} at (0,0) size 202x38 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (47,1) size 154x37
+                    text run at (47,1) width 154 RTL: "\x{5D9}\x{5B0}\x{5D4}\x{5B4}\x{5D9}, \x{5D0}\x{5B8}\x{5D7}\x{5B4}\x{5D9}, \x{5DC}\x{5B0}\x{5DA}\x{5B8} \x{5E1}\x{5B5}\x{5E4}\x{5B6}\x{5E8} \x{5E9}\x{5C1}\x{5B0}\x{5DC}\x{5B7}\x{5D7}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5}"
+                    text run at (50,19) width 104 RTL: "\x{5E6}\x{5B0}\x{5DE}\x{5B4}\x{5D9}\x{5EA}\x{5D5}\x{5BC}\x{5EA} \x{5DC}\x{5B8}\x{5DA}\x{5B0} \x{5DE}\x{5B0}\x{5DB}\x{5B7}\x{5E8}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5}."
+                    text run at (154,19) width 47 RTL: "\x{5D5}\x{5BC}\x{5DE}\x{5B4}\x{5DE}\x{5B0}\x{5DB}\x{5BC}\x{5B6}\x{5E8}\x{5B6}\x{5EA} "
+                RenderBlock {DIV} at (0,43) size 202x62 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (1,1) size 176x59
+                    text run at (1,1) width 132: "Lore\x{300}m ipsum dolor sit"
+                    text run at (1,21) width 176: "ame\x{300}t, consectetuer adipiscing"
+                    text run at (1,41) width 21: "e\x{300}lit."
+                RenderBlock {DIV} at (0,110) size 202x62 [border: (1px solid #008000)]
+                  RenderText {#text} at (1,1) size 196x59
+                    text run at (1,1) width 162: "Lorem ipsum dolor sit"
+                    text run at (1,21) width 196: "amet, consectetuer adipiscing"
+                    text run at (1,41) width 21: "elit."
+            RenderTableCell {TD} at (208,26) size 204x194 [r=1 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 202x192
+                RenderBlock {DIV} at (0,0) size 202x38 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (0,1) size 201x37
+                    text run at (0,1) width 201 RTL: "\x{5D9}\x{5B0}\x{5D4}\x{5B4}\x{5D9}, \x{5D0}\x{5B8}\x{5D7}\x{5B4}\x{5D9}, \x{5DC}\x{5B0}\x{5DA}\x{5B8} \x{5E1}\x{5B5}\x{5E4}\x{5B6}\x{5E8} \x{5E9}\x{5C1}\x{5B0}\x{5DC}\x{5B7}\x{5D7}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5} \x{5D5}\x{5BC}\x{5DE}\x{5B4}\x{5DE}\x{5B0}\x{5DB}\x{5BC}\x{5B6}\x{5E8}\x{5B6}\x{5EA}"
+                    text run at (97,19) width 104 RTL: "\x{5E6}\x{5B0}\x{5DE}\x{5B4}\x{5D9}\x{5EA}\x{5D5}\x{5BC}\x{5EA} \x{5DC}\x{5B8}\x{5DA}\x{5B0} \x{5DE}\x{5B0}\x{5DB}\x{5B7}\x{5E8}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5}."
+                RenderBlock {DIV} at (0,43) size 202x62 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (1,1) size 130x59
+                    text run at (1,1) width 115: "Lore\x{300}m ipsum dolor"
+                    text run at (1,21) width 130: "sit ame\x{300}t, consectetue\x{300}r"
+                    text run at (1,41) width 84: "adipiscing e\x{300}lit."
+                RenderBlock {DIV} at (0,110) size 202x82 [border: (1px solid #008000)]
+                  RenderText {#text} at (1,1) size 200x79
+                    text run at (1,1) width 200: "Lorem ipsum dolor"
+                    text run at (1,21) width 95: "sit amet,"
+                    text run at (1,41) width 136: "consectetuer"
+                    text run at (1,61) width 164: "adipiscing elit."
+            RenderTableCell {TD} at (414,26) size 204x134 [r=1 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 202x132
+                RenderBlock {DIV} at (0,0) size 202x38 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (1,1) size 13307x37
+                    text run at (1,1) width 13307 RTL: "\x{5D9}\x{5B0}\x{5D4}\x{5B4}\x{5D9}, \x{5D0}\x{5B8}\x{5D7}\x{5B4}\x{5D9}, \x{5DC}\x{5B0}\x{5DA}\x{5B8} \x{5E1}\x{5B5}\x{5E4}\x{5B6}\x{5E8} \x{5E9}\x{5C1}\x{5B0}\x{5DC}\x{5B7}\x{5D7}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5} \x{5D5}\x{5BC}\x{5DE}\x{5B4}\x{5DE}\x{5B0}\x{5DB}\x{5BC}\x{5B6}\x{5E8}\x{5B6}\x{5EA}"
+                    text run at (97,19) width 104 RTL: "\x{5E6}\x{5B0}\x{5DE}\x{5B4}\x{5D9}\x{5EA}\x{5D5}\x{5BC}\x{5EA} \x{5DC}\x{5B8}\x{5DA}\x{5B0} \x{5DE}\x{5B0}\x{5DB}\x{5B7}\x{5E8}\x{5B0}\x{5EA}\x{5BC}\x{5B4}\x{5D9}\x{5D5}."
+                RenderBlock {DIV} at (0,43) size 202x42 [border: (1px solid #0000FF)]
+                  RenderText {#text} at (1,1) size 200x39
+                    text run at (1,1) width 200: "Lore\x{300}m ipsum dolor sit ame\x{300}t,"
+                    text run at (1,21) width 164: "consectetue\x{300}r adipiscing e\x{300}lit."
+                RenderBlock {DIV} at (0,90) size 202x42 [border: (1px solid #008000)]
+                  RenderText {#text} at (1,1) size 200x39
+                    text run at (1,1) width 200: "Lorem ipsum dolor sit amet,"
+                    text run at (1,21) width 164: "consectetuer adipiscing elit."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.checksum
index 18ac696..9320377 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.checksum
@@ -1 +1 @@
-2759efb44a6f933bb649310c52daa857
\ No newline at end of file
+d5334d76b9f6a5b5a60dfaf27c77fe48
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.png
index e5dd08f..437e0cf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/atsui-spacing-features-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2fcae8b..d709ae8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2162,7 +2162,6 @@ BUG10426 LINUX : LayoutTests/fast/lists/drag-into-marker.html = FAIL
 BUG10429 LINUX : LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html = FAIL
 
 // New failures from Merge 41078:41149
-BUG10430 LINUX WIN : LayoutTests/fast/text/atsui-spacing-features.html = FAIL
 BUG10430 LINUX : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
 BUG10430 LINUX WIN : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
 BUG10430 LINUX WIN : LayoutTests/svg/text/text-intro-05-t.svg = FAIL