linux: two rebaselines due to recent work of mine on complex text

BUG=30180,32201,33356

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

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

7 files changed, 18 insertions, 23 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
index 58c93c4..1c07223 100644
--- 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
@@ -1 +1 @@
-2706adb59ad8f3ddc9248fcb2ef3093d
\ No newline at end of file
+381967ded6e017368430e4533e37552a
\ 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
index 06a9cb2..b55b80b 100644
--- 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
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
index d389e4c..8d9f3a6 100644
--- 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
@@ -1,6 +1,6 @@
-layer at (0,0) size 13731x585
-  RenderView at (0,0) size 800x585
-layer at (0,0) size 13731x340
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x340
   RenderBlock {HTML} at (0,0) size 800x340
     RenderBody {BODY} at (8,16) size 784x316
       RenderBlock {P} at (0,0) size 784x40
@@ -35,8 +35,8 @@ layer at (0,0) size 13731x340
             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}"
+                  RenderText {#text} at (63,1) size 151x37
+                    text run at (63,1) width 138 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)]
@@ -52,8 +52,8 @@ layer at (0,0) size 13731x340
             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}"
+                  RenderText {#text} at (16,1) size 185x37
+                    text run at (16,1) width 185 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
@@ -69,8 +69,8 @@ layer at (0,0) size 13731x340
             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}"
+                  RenderText {#text} at (1,1) size 200x37
+                    text run at (1,1) width 200 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
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.checksum
index d0925b1..68c6e8d 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.checksum
@@ -1 +1 @@
-438c02235ba2a04ce8e1a8c43dfe84b1
\ No newline at end of file
+7cacf2c426981fa5260586631712930b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.png
index 5edec62..0f9d7e1 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.txt
index f8a51d4..0702e36 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/hindi-whitespace-expected.txt
@@ -1,15 +1,15 @@
-layer at (0,0) size 863x585
-  RenderView at (0,0) size 800x585
-layer at (0,0) size 863x585
-  RenderBlock {HTML} at (0,0) size 800x585
-    RenderBody {BODY} at (8,8) size 784x561
+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 784x40
         RenderText {#text} at (0,0) size 733x39
           text run at (0,0) width 733: "This HTML tests if the 'while-space' property controls the behavors of line-break characters (U+000A and U+000D) in a"
           text run at (0,20) width 127: "complex text (Hindi)."
       RenderBlock {P} at (0,56) size 784x40
-        RenderText {#text} at (0,0) size 855x39
-          text run at (0,0) width 855: "If this test succeeds, you can see this Hindi word \"\x{935}\x{93F}\x{937}\x{92F}\x{94B}\x{902}\" repeated three times separated by a space in the first two paragraphs. In"
+        RenderText {#text} at (0,0) size 780x39
+          text run at (0,0) width 780: "If this test succeeds, you can see this Hindi word \"\x{935}\x{93F}\x{937}\x{92F}\x{94B}\x{902}\" repeated three times separated by a space in the first two paragraphs. In"
           text run at (0,20) width 378: "the third paragraphs, it'll be shown three times in separate lines."
       RenderBlock {P} at (0,112) size 784x20
         RenderText {#text} at (0,0) size 132x19
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index efdb5738..1f90e8b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2725,9 +2725,6 @@ BUG30048 : svg/css/composite-shadow-with-opacity.html = IMAGE
 // Broke with http://trac.webkit.org/changeset/51939
 BUG30049 : platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html = TEXT MISSING
 
-// Flaky.
-BUG30180 : fast/text/international/hindi-whitespace.html = IMAGE+TEXT PASS
-
 // evan's fix rolled out in http://trac.webkit.org/changeset/52071 due to compat issues.
 BUG30343 LINUX : fast/css/large-number-round-trip.html = TEXT
 
@@ -2836,8 +2833,6 @@ BUG32149 WIN RELEASE : fast/dom/Document/early-document-access.html = TIMEOUT PA
 
 BUG32195 : fast/repaint/renderer-destruction-by-invalidateSelection-crash.html = IMAGE+TEXT PASS
 
-BUG32201 LINUX : fast/text/atsui-spacing-features.html = IMAGE+TEXT
-
 // Expectations from roll to 53171:53194
 BUG32235 LINUX DEBUG : svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = PASS TEXT