Rebaseline tests from previous merges.

BUG=10446,9924

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


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

16 files changed, 22 insertions, 172 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.checksum
deleted file mode 100644
index f8bce97..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-bb64a8ccdf90652a1bb8ced6fc35dc0f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png
deleted file mode 100644
index 8b8b0f6..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum
index 5b9c9f2..1da6547 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum
@@ -1 +1 @@
-8593dc85593596e5b4621668f9a0ec3e
\ No newline at end of file
+fd1cdd8c565d0841f6ecd7ca9c19ba0d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png
index 1d2d4d9..eec0246 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.checksum
index 7dfa9a5..3b69199 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.checksum
@@ -1 +1 @@
-1847298a32a6eba13b74bdd2c3543540
\ No newline at end of file
+95646517a8c76b35240561b02ea418aa
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.png
index a9708ba..2ed9637 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/select-all-002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.checksum
index ce0aa63..a6c4b76 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.checksum
@@ -1 +1 @@
-7e1c47bc75115aa18a5fa6bd86ce1ddd
\ No newline at end of file
+a02c05c5e3ceb015521b980e4811cbc3
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.png
index 73518f8..6221616 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/016-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.checksum
index 0647b8d..b2974e28 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.checksum
@@ -1 +1 @@
-75ea89d5024ad24ea26e625627f67c75
\ No newline at end of file
+431efd5b694f3f445591eb97f1ba1177
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.png
new file mode 100644
index 0000000..d73404b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/flexbox/flex-hang-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.checksum
new file mode 100644
index 0000000..d13c7ee
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.checksum
@@ -0,0 +1 @@
+099e7169a0cf14fe9074c4f87081fd01
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.png
new file mode 100644
index 0000000..46d17ef
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.txt
new file mode 100644
index 0000000..7293677
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/long-wrapped-line-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 1904x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 1904x585
+  RenderBlock {HTML} at (0,0) size 800x585
+    RenderBody {BODY} at (8,8) size 784x569
+      RenderInline {SPAN} at (0,0) size 1896x19
+        RenderText {#text} at (0,0) size 1896x19
+          text run at (0,0) width 1896: "Side note.  Both GR's have been cleaned by both myself and Miguet -  Please keep our GR's clean or there will be Fire and Brimstone.  The state of the GR2 today was Unacceptable with random parts that were suppose to be KGB that were not labeled,  RTW,  RFP and attached to a machine in awaiting parts. .  "
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-2-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-2-expected.txt
deleted file mode 100644
index d43b183..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-2-expected.txt
+++ /dev/null
@@ -1,156 +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 784x584
-      RenderBlock (floating) {DIV} at (8,8) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 151x22
-          text run at (0,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 180x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (151,0) size 180x45
-            text run at (151,0) width 29: " sit "
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (224,8) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (12,0) size 151x22
-          text run at (12,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 111x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (163,0) size 111x45
-            text run at (163,0) width 24: " sit"
-            text run at (187,0) width 5: " "
-            text run at (81,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (440,8) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (25,0) size 151x22
-          text run at (25,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 37x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (176,0) size 37x45
-            text run at (176,0) width 24: " sit"
-            text run at (200,0) width 0: " "
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (8,70) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 167x22
-          text run at (0,0) width 167: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (167,0) size 200x45
-            text run at (167,0) width 33: " sit"
-            text run at (200,0) width 0: " "
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 151x22
-          text run at (0,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 175x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (0,0) size 175x45
-            text run at (0,0) width 0 RTL: " "
-            text run at (151,0) width 24: " sit"
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (440,70) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (12,0) size 151x22
-          text run at (12,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 180x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (7,0) size 180x45
-            text run at (7,0) width 5 RTL: " "
-            text run at (163,0) width 24: " sit"
-            text run at (81,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (8,132) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (25,0) size 151x22
-          text run at (25,0) width 151: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 180x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (20,0) size 180x45
-            text run at (20,0) width 5 RTL: " "
-            text run at (176,0) width 24: " sit"
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (224,132) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 167x22
-          text run at (0,0) width 167: "Lorem ipsum dolor"
-        RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (0,0) size 200x45
-            text run at (0,0) width 0 RTL: " "
-            text run at (167,0) width 33: " sit"
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (440,132) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 181x22
-          text run at (0,0) width 108: "Lorem ipsum "
-          text run at (146,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-        RenderInline {SPAN} at (0,0) size 186x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (108,0) size 186x45
-            text run at (108,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (181,0) width 5: " "
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (8,194) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (9,0) size 181x22
-          text run at (9,0) width 108: "Lorem ipsum "
-          text run at (155,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-        RenderInline {SPAN} at (0,0) size 114x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (117,0) size 114x45
-            text run at (117,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (190,0) width 5: " "
-            text run at (81,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (224,194) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (19,0) size 181x22
-          text run at (19,0) width 108: "Lorem ipsum "
-          text run at (165,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-        RenderInline {SPAN} at (0,0) size 73x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (127,0) size 73x45
-            text run at (127,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (200,0) width 0: " "
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (440,194) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 200x22
-          text run at (0,0) width 120: "Lorem ipsum "
-          text run at (165,0) width 35 RTL: "\x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-        RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (120,0) size 200x45
-            text run at (120,0) width 45 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (200,0) width 0: " "
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (8,256) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (38,0) size 143x22
-          text run at (38,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-          text run at (78,0) width 103: "Lorem ipsum"
-        RenderInline {SPAN} at (0,0) size 38x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (0,0) size 38x45
-            text run at (0,0) width 0 RTL: " "
-            text run at (0,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (0,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (224,256) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (47,0) size 143x22
-          text run at (47,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-          text run at (87,0) width 103: "Lorem ipsum"
-        RenderInline {SPAN} at (0,0) size 114x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (4,0) size 114x45
-            text run at (4,0) width 5 RTL: " "
-            text run at (9,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (81,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (440,256) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (57,0) size 143x22
-          text run at (57,0) width 40 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-          text run at (97,0) width 103: "Lorem ipsum"
-        RenderInline {SPAN} at (0,0) size 186x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (14,0) size 186x45
-            text run at (14,0) width 5 RTL: " "
-            text run at (19,0) width 38 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
-      RenderBlock (floating) {DIV} at (8,318) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (44,0) size 156x22
-          text run at (44,0) width 46 RTL: " \x{5D0}\x{5E0}\x{5D8}\x{5E3}"
-          text run at (90,0) width 110: "Lorem ipsum"
-        RenderInline {SPAN} at (0,0) size 200x45 [bgcolor=#FFC0CB]
-          RenderText {#text} at (0,0) size 200x45
-            text run at (0,0) width 0 RTL: " "
-            text run at (0,0) width 44 RTL: " \x{5E9}\x{5DC}\x{5D2}\x{5D9}"
-            text run at (163,23) width 37: "amet"
-        RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-expected.txt
index 72050d8..a222151 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/trailing-white-space-expected.txt
@@ -5,7 +5,8 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock (floating) {DIV} at (8,8) size 200x46 [bgcolor=#FFFFE0]
         RenderText {#text} at (0,0) size 180x45
-          text run at (0,0) width 180: "Lorem ipsum dolor sit "
+          text run at (0,0) width 175: "Lorem ipsum dolor sit"
+          text run at (175,0) width 5: " "
           text run at (0,23) width 37: "amet"
       RenderBlock (floating) {DIV} at (224,8) size 200x46 [bgcolor=#FFFFE0]
         RenderText {#text} at (12,0) size 180x45
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5ce52fd..ea74a89 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -961,7 +961,7 @@ BUG1026885 DEFER LINUX WIN : LayoutTests/editing/selection/4960137.html = FAIL
 // unpainted space (filled red in Debug but not in Release).
 // https://bugs.webkit.org/show_bug.cgi?id=8423
 BUG1115062 DEFER : LayoutTests/tables/mozilla_expected_failures/bugs/bug178855.xml = FAIL PASS
-BUG1115062 DEFER DEBUG : LayoutTests/fast/flexbox/flex-hang.html = FAIL PASS
+BUG1115062 DEFER WIN MAC DEBUG : LayoutTests/fast/flexbox/flex-hang.html = FAIL PASS
 
 // Fails on webkit windows as well.
 BUG1166644 DEFER WIN LINUX : LayoutTests/fast/events/attempt-scroll-with-no-scrollbars.html = FAIL
@@ -2016,14 +2016,11 @@ BUG10444 DEFER WIN LINUX : LayoutTests/fast/repaint/transform-replaced-shadows.h
 // Added 3/11/09
 BUG10445 LINUX : LayoutTests/fast/compact/001.html = CRASH PASS
 
-// Regressions from merge 41559:41588
-// This one probably just needs a new baseline:
-BUG10446 LINUX : LayoutTests/fast/inline/long-wrapped-line.html = FAIL
+// The text extends outside the selection on linux (was happening before the
+// merge).
 BUG10446 LINUX : LayoutTests/editing/execCommand/selectAll.html = FAIL
-BUG10446 LINUX : LayoutTests/fast/text/trailing-white-space.html = FAIL
-BUG10446 LINUX : LayoutTests/fast/text/trailing-white-space-2.html = FAIL
-BUG10446 LINUX : LayoutTests/editing/selection/extend-by-word-002.html = FAIL
-BUG10446 LINUX : LayoutTests/editing/selection/select-all-002.html = FAIL
+
+// Regressions from merge 41559:41588, probably just needs rebaselining.
 BUG_GWILSON MAC : chrome/fast/forms/basic-textareas-quirks.html = FAIL
 BUG_GWILSON MAC : chrome/fast/forms/basic-textareas.html = FAIL
 
@@ -2427,8 +2424,6 @@ BUG9916 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = FA
 
 // New tests or failures from WebKit merge 42324:42364. Re-baselined on
 // Windows. Probably just need the same on other platforms.
-BUG9924 LINUX : LayoutTests/fast/flexbox/016.html = FAIL
-BUG9924 LINUX RELEASE : LayoutTests/fast/flexbox/flex-hang.html = FAIL
 BUG9962 LINUX : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = FAIL
 BUG9962 MAC : LayoutTests/fast/js/function-apply-aliased.html = FAIL
 BUG9962 MAC : LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html = FAIL