Rebaseline WebKit tests as a result of the merge. These are the same tests...

webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/editable-text-overlapping-float-expected.txt

Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/editable-text-overlapping-float-expected.txt
===================================================================
--- webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/editable-text-overlapping-float-expected.txt	(revision 11482)
+++ webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/editable-text-overlapping-float-expected.txt	(working copy)
@@ -8,15 +8,23 @@
           text run at (0,0) width 241: "Text should not overlap the blue square."
       RenderBlock {DIV} at (0,36) size 406x210 [border: (3px solid #800000)]
         RenderText {#text} at (5,5) size 396x79
-          text run at (5,5) width 392: "Fusce at ante. In hac habitasse platea dictumst. Maecenas iaculis "
-          text run at (5,25) width 321: "nonummy magna. Vivamus a tortor vitae enim ornare "
-          text run at (5,45) width 396: "consectetuer. Lorem ipsum dolor sit amet, consectetuer adipiscing "
+          text run at (5,5) width 388: "Fusce at ante. In hac habitasse platea dictumst. Maecenas iaculis"
+          text run at (393,5) width 4: " "
+          text run at (5,25) width 317: "nonummy magna. Vivamus a tortor vitae enim ornare"
+          text run at (322,25) width 4: " "
+          text run at (5,45) width 396: "consectetuer. Lorem ipsum dolor sit amet, consectetuer adipiscing"
+          text run at (401,45) width 0: " "
           text run at (5,65) width 310: "elit. Etiam et ipsum. Nam consectetuer mi eget velit."
         RenderBlock (floating) {DIV} at (337,65) size 64x64 [bgcolor=#ADD8E6]
         RenderText {#text} at (5,85) size 362x119
-          text run at (5,85) width 317: "Sed nec risus vitae felis auctor ultricies. Pellentesque "
-          text run at (5,105) width 315: "aliquet quam ac lorem. Duis interdum, elit in ultricies "
-          text run at (5,125) width 318: "auctor, erat pede sollicitudin libero, non ultrices odio "
-          text run at (5,145) width 360: "elit in augue. Ut egestas bibendum lectus. Class aptent taciti "
-          text run at (5,165) width 362: "sociosqu ad litora torquent per conubia nostra, per inceptos "
+          text run at (5,85) width 313: "Sed nec risus vitae felis auctor ultricies. Pellentesque"
+          text run at (318,85) width 4: " "
+          text run at (5,105) width 311: "aliquet quam ac lorem. Duis interdum, elit in ultricies"
+          text run at (316,105) width 4: " "
+          text run at (5,125) width 314: "auctor, erat pede sollicitudin libero, non ultrices odio"
+          text run at (319,125) width 4: " "
+          text run at (5,145) width 356: "elit in augue. Ut egestas bibendum lectus. Class aptent taciti"
+          text run at (361,145) width 4: " "
+          text run at (5,165) width 358: "sociosqu ad litora torquent per conubia nostra, per inceptos"
+          text run at (363,165) width 4: " "
           text run at (5,185) width 71: "hymenaeos."