Chromium Linux rebaseline. The difference is negligible for the purpose of this test.

* platform/chromium-linux/fast/forms/textarea-width-expected.png:
* platform/chromium-linux/fast/forms/textarea-width-expected.txt: Added.
* platform/chromium/test_expectations.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@103749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 66802cc9ca916c475d542520813689b73a36b28b..7c5de278953be972a9cd229fa5c65ac06e69b2c3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Chromium Linux rebaseline. The difference is negligible for the purpose of this test.
+
+        * platform/chromium-linux/fast/forms/textarea-width-expected.png:
+        * platform/chromium-linux/fast/forms/textarea-width-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+
 2011-12-27  Ryosuke Niwa  <rniwa@webkit.org>
 
         Chromium Linux rebsaeline for http://crbug.com/10430. Glyphs look correct.

diff --git a/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.png b/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.png
index 59965b83309925c0f93f89dd8ede9017a5adb6dc..eb086f7b57cf9a74c6cd8932111c02d6be706636 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.png and b/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.png differ

diff --git a/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.txt b/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.txt
new file mode 100644 (file)
index 0000000..ed769f4
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/forms/textarea-width-expected.txt
@@ -0,0 +1,20 @@
+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 784x584
+      RenderBlock {DIV} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 779x39
+          text run at (0,0) width 779: "This text area should be drawn with a reasonable width. To match IE, using GDI fonts it should wrap at 66 characters (after the X"
+          text run at (0,20) width 470: "in the third set of digits). See https://bugs.webkit.org/show_bug.cgi?id=15312."
+      RenderBlock (anonymous) at (0,40) size 784x264
+        RenderBR {BR} at (0,0) size 0x19
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,68) size 459x244 clip at (9,69) size 457x242
+  RenderTextControl {TEXTAREA} at (0,20) size 459x244 [color=#333333] [bgcolor=#FFFFFF] [border: (1px solid #333333)]
+    RenderBlock {DIV} at (3,3) size 455x36
+      RenderText {#text} at (0,0) size 453x24
+        text run at (0,0) width 453: "1234567890abcdefghijABCDEFGHIJ1234567890abcdefghijABCDEFGHIJ12345X789"
+        text run at (0,12) width 326: "0abcdefghijABCDEFGXIJ1234567890abcdefghijABCDEFGHIJ"
+        text run at (326,12) width 0: " "
+      RenderBR {BR} at (0,24) size 0x12

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index f7ed1d8c4231a81ef36c66b7996398b370ebc568..f1cfe420630a26cb5dafb8aa852a51b15f95ea4e 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1510,13 +1510,6 @@ BUGCR10429 LINUX : css2.1/t100801-c544-valgn-01-d-ag.html = FAIL
 // This test also started failing with the merge of March 25th 2009
 BUGCR10441 MAC WIN : transitions/transition-end-event-transform.html = PASS TEXT
 
-// Merge 41768:41807
-// Perhaps just needs new baseline?
-// These tests were rebaselined with failure long ago. We shouldn't do this, and
-// instead work upstream to improve tests so that they don't fail.
-// Just need rebaseline
-BUGCR10458 LINUX : fast/forms/textarea-width.html = FAIL
-
 // New failures from merge
 BUGCR27486 LINUX WIN : fast/forms/listbox-hit-test-zoomed.html = IMAGE+TEXT
 BUGCR27486 LINUX WIN : fast/forms/range/slider-zoomed.html = TEXT