Chrome side of merge 41733:41768.

webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt

Index: webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt
===================================================================
--- webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt	(revision 11875)
+++ webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt	(working copy)
@@ -1,23 +1,23 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x178
-  RenderBlock {html} at (0,0) size 800x178
-layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220
-  RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
-    RenderBlock {p} at (1,17) size 145x60
-      RenderText {#text} at (0,0) size 140x59
-        text run at (0,0) width 97: "There should be"
-        text run at (0,20) width 140: "scrollbars for this box -"
-        text run at (0,40) width 133: "- not for the viewport."
-    RenderBlock {p} at (1,93) size 145x20 [color=#808080]
-      RenderText {#text} at (0,0) size 97x19
-        text run at (0,0) width 97: "This is filler text."
-    RenderBlock {p} at (1,129) size 145x20 [color=#808080]
-      RenderText {#text} at (0,0) size 97x19
-        text run at (0,0) width 97: "This is filler text."
-    RenderBlock {p} at (1,165) size 145x20 [color=#808080]
-      RenderText {#text} at (0,0) size 97x19
-        text run at (0,0) width 97: "This is filler text."
-    RenderBlock {p} at (1,201) size 145x20 [color=#808080]
-      RenderText {#text} at (0,0) size 97x19
-        text run at (0,0) width 97: "This is filler text."
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+  RenderBlock {html} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+  RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+    RenderBlock {p} at (1,17) size 145x60
+      RenderText {#text} at (0,0) size 140x59
+        text run at (0,0) width 97: "There should be"
+        text run at (0,20) width 140: "scrollbars for this box -"
+        text run at (0,40) width 133: "- not for the viewport."
+    RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+      RenderText {#text} at (0,0) size 97x19
+        text run at (0,0) width 97: "This is filler text."
+    RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+      RenderText {#text} at (0,0) size 97x19
+        text run at (0,0) width 97: "This is filler text."
+    RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+      RenderText {#text} at (0,0) size 97x19
+        text run at (0,0) width 97: "This is filler text."
+    RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+      RenderText {#text} at (0,0) size 97x19
+        text run at (0,0) width 97: "This is filler text."