Rebaseline 3 layout tests:

LayoutTests\fast\text\drawBidiText.html
The text metrics don't match, otherwise the bidi order of the text matches the one in Safari and text size matches the same page in IE (but IE has apparently incorrect bidi order)

LayoutTests\fast\css\rtl-ordering.html
The test verifies the ordering of rtl characters and it matches the Safari and expected result. The font metrics match IE (except default margin values that are differrent in IE).

LayoutTests\fast\encoding\denormalised-voiced-japanese-chars.html
The rendering is correct (denormalized unicode for Hiragana is composed back into correct glyphs) and matches Safari. The text metrics match IE.

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

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

10 files changed, 52 insertions, 54 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.checksum
index efe4c9a..11602a5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.checksum
@@ -1 +1 @@
-0b882c51adf4e2e24f79a2d70840af73
\ No newline at end of file
+da82a4d85336d19c342d38c814de5758
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.png
index d56ece4..5047baf 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.txt
index c2a3c9b..8fc4031 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/rtl-ordering-expected.txt
@@ -2,46 +2,46 @@ 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 202x19
-          text run at (0,0) width 202 LTR override: "This tests for a regression against "
-        RenderInline {I} at (0,0) size 702x39
-          RenderInline {A} at (0,0) size 350x19 [color=#0000EE]
-            RenderText {#text} at (202,0) size 350x19
-              text run at (202,0) width 350 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6334"
-          RenderText {#text} at (552,0) size 702x39
-            text run at (552,0) width 150 LTR override: " REGRESSION: <input"
-            text run at (0,20) width 382 LTR override: "type=\"button\"> text is reversed on \"visual Hebrew\" pages"
-        RenderText {#text} at (382,20) size 4x19
-          text run at (382,20) width 4 LTR override: "."
-      RenderBlock {HR} at (0,56) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,74) size 784x20
-        RenderText {#text} at (0,0) size 280x19
-          text run at (0,0) width 246 LTR override: "The text on both buttons should like this: "
-          text run at (246,0) width 34 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-      RenderBlock (anonymous) at (0,110) size 784x44
-        RenderButton {BUTTON} at (0,0) size 51x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-          RenderBlock (anonymous) at (8,2) size 35x18
-            RenderText {#text} at (3,1) size 29x15
-              text run at (3,1) width 29 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-        RenderText {#text} at (51,0) size 4x19
-          text run at (51,0) width 4 LTR override: " "
-        RenderBR {BR} at (55,15) size 0x0
-        RenderButton {INPUT} at (0,22) size 51x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-          RenderBlock (anonymous) at (8,2) size 35x18
-            RenderText at (3,1) size 29x15
-              text run at (3,1) width 29 RTL: "\x{5DB}\x{5E4}\x{5EA}\x{5D5}\x{5E8}"
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (1,0) size 782x32
+        RenderText {#text} at (0,0) size 212x16
+          text run at (0,0) width 212 LTR override: "This tests for a regression against "
+        RenderInline {I} at (0,0) size 712x32
+          RenderInline {A} at (0,0) size 344x16 [color=#0000EE]
+            RenderText {#text} at (212,0) size 344x16
+              text run at (212,0) width 344 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6334"
+          RenderText {#text} at (556,0) size 712x32
+            text run at (556,0) width 156 LTR override: " REGRESSION: <input"
+            text run at (0,16) width 368 LTR override: "type=\"button\"> text is reversed on \"visual Hebrew\" pages"
+        RenderText {#text} at (368,16) size 4x16
+          text run at (368,16) width 4 LTR override: "."
+      RenderBlock {HR} at (0,40) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (1,50) size 782x16
+        RenderText {#text} at (0,0) size 300x16
+          text run at (0,0) width 263 LTR override: "The text on both buttons should like this: "
+          text run at (263,0) width 37 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+      RenderBlock (anonymous) at (0,67) size 784x38
+        RenderButton {BUTTON} at (0,0) size 52x19 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 36x15
+            RenderText {#text} at (3,1) size 30x13
+              text run at (3,1) width 30 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+        RenderText {#text} at (52,1) size 4x16
+          text run at (52,1) width 4 LTR override: " "
+        RenderBR {BR} at (56,13) size 0x0
+        RenderButton {INPUT} at (0,19) size 52x19 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 36x15
+            RenderText at (3,1) size 30x13
+              text run at (3,1) width 30 RTL: "\x{5DB}\x{5E4}\x{5EA}\x{5D5}\x{5E8}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {HR} at (0,162) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,180) size 784x20
-        RenderText {#text} at (0,0) size 229x19
-          text run at (0,0) width 229 LTR override: "The following lines should be identical:"
-      RenderBlock {P} at (0,216) size 784x20
-        RenderText {#text} at (0,0) size 66x19
-          text run at (0,0) width 16: "21"
-          text run at (16,0) width 50 RTL: "\x{5D4}\x{5DE}\x{5D0}\x{5D4} \x{5D4}-"
-      RenderBlock {P} at (0,252) size 784x20
-        RenderText {#text} at (0,0) size 66x19
-          text run at (0,0) width 22 LTR override: "21-"
-          text run at (22,0) width 44 LTR override: "\x{5D4} \x{5D4}\x{5D0}\x{5DE}\x{5D4}"
+      RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (1,123) size 782x16
+        RenderText {#text} at (0,0) size 251x16
+          text run at (0,0) width 251 LTR override: "The following lines should be identical:"
+      RenderBlock {P} at (1,140) size 782x16
+        RenderText {#text} at (0,0) size 68x16
+          text run at (0,0) width 14: "21"
+          text run at (14,0) width 54 RTL: "\x{5D4}\x{5DE}\x{5D0}\x{5D4} \x{5D4}-"
+      RenderBlock {P} at (1,157) size 782x16
+        RenderText {#text} at (0,0) size 68x16
+          text run at (0,0) width 19 LTR override: "21-"
+          text run at (19,0) width 49 LTR override: "\x{5D4} \x{5D4}\x{5D0}\x{5DE}\x{5D4}"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum
index 0d39783..a27981f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.checksum
@@ -1 +1 @@
-49916b9a798c6000ea30a6b7089357e6
\ No newline at end of file
+f01803f7eab8f1351eda890e3b094e77
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png
index 39d9a57..d6777f0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
index e29ca69..d030bf8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
@@ -8,14 +8,14 @@ layer at (0,0) size 800x234
           text run at (0,0) width 784: "This test checks that the decomposed unicode version of voiced japanese hiragana and katakana characters are rendered the same"
           text run at (0,20) width 717: "as the precomposed version. This test is a pixel-test, and passes when the text in the two heading elements are identical."
       RenderBlock {H2} at (0,59) size 784x27
-        RenderText {#text} at (0,0) size 175x26
-          text run at (0,0) width 175: "\x{30CF}\x{3099}\x{30CA}\x{30CA}\x{3068}\x{30CF}\x{309A}\x{30CA}\x{30DE}"
+        RenderText {#text} at (0,0) size 164x26
+          text run at (0,0) width 164: "\x{30CF}\x{3099}\x{30CA}\x{30CA}\x{3068}\x{30CF}\x{309A}\x{30CA}\x{30DE}"
       RenderBlock {P} at (0,105) size 784x20
         RenderText {#text} at (0,0) size 159x19
           text run at (0,0) width 159: "The above is decomposed"
       RenderBlock {H2} at (0,144) size 784x27
-        RenderText {#text} at (0,0) size 175x26
-          text run at (0,0) width 175: "\x{30D0}\x{30CA}\x{30CA}\x{3068}\x{30D1}\x{30CA}\x{30DE}"
+        RenderText {#text} at (0,0) size 164x26
+          text run at (0,0) width 164: "\x{30D0}\x{30CA}\x{30CA}\x{3068}\x{30D1}\x{30CA}\x{30DE}"
       RenderBlock {P} at (0,190) size 784x20
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 164: "The above is precomposed"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.checksum
index d362876..e3c9e82 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.checksum
@@ -1 +1 @@
-75fd89f78b44d29a5e2adf489a7f9538
\ No newline at end of file
+ee6962e8ebb5a19d204e3c279bb98863
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.png
index 9289c4d..ba6674d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.txt
index 0f30da8..cac38240 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/drawBidiText-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 264x19
           text run at (0,0) width 264: "This tests GraphicsContext::drawBidiText()."
-      RenderListBox {SELECT} at (0,36) size 300x190 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-      RenderListBox {SELECT} at (0,226) size 330x18 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+      RenderListBox {SELECT} at (0,36) size 327x199 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+      RenderListBox {SELECT} at (0,235) size 365x18 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 2bfa3da..16a5905 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -953,7 +953,7 @@ LINUX WIN : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
 WIN : LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL
 // Likely just needs to be baselined.
 LINUX MAC : LayoutTests/fast/replaced/width100percent-textarea.html = FAIL
-LINUX WIN : LayoutTests/fast/text/drawBidiText.html = FAIL
+LINUX : LayoutTests/fast/text/drawBidiText.html = FAIL
 LINUX : LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = TIMEOUT PASS
 LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame.html = FAIL
 LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url.html = FAIL
@@ -1435,8 +1435,6 @@ LINUX : LayoutTests/fast/events/5056619.html = PASS FAIL
 LayoutTests/http/tests/navigation/error404-goback.html = FAIL
 
 // Started failing when landing the new skia r6925.
-WIN : LayoutTests/fast/css/rtl-ordering.html = FAIL
-WIN : LayoutTests/fast/encoding/denormalised-voiced-japanese-chars.html = FAIL
 WIN : LayoutTests/fast/forms/select-visual-hebrew.html = FAIL
 WIN : LayoutTests/fast/forms/visual-hebrew-text-field.html = FAIL
 WIN : LayoutTests/fast/lists/w3-list-styles.html = FAIL