WebKit Merge 41768:41807, Chromium Side

webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/negativeLineHeight-expected.txt

Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/negativeLineHeight-expected.txt
===================================================================
--- webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/negativeLineHeight-expected.txt	(revision 11966)
+++ webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/negativeLineHeight-expected.txt	(working copy)
@@ -17,8 +17,8 @@
         RenderBR {BR} at (0,227) size 0x19
 layer at (8,65) size 400x200 clip at (9,66) size 398x198
   RenderTextControl {TEXTAREA} at (0,21) size 400x200 [bgcolor=#FFFFFF] [border: (1px dotted #C0C0C0)]
-    RenderBlock {DIV} at (3,3) size 379x32
-      RenderText {#text} at (0,0) size 299x32
-        text run at (0,0) width 294: "Demo text here that wraps a bit and should"
-        text run at (294,0) width 5: " "
-        text run at (0,16) width 272: "demonstrate the goodness of line-height"
+    RenderBlock {DIV} at (3,3) size 396x32
+      RenderText {#text} at (0,0) size 390x32
+        text run at (0,0) width 385: "Demo text here that wraps a bit and should demonstrate"
+        text run at (385,0) width 5: " "
+        text run at (0,16) width 181: "the goodness of line-height"