Auto-rebaseline for r181499

LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt

Index: LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt
diff --git a/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt
index aebd5dc68c8834af98bc15c240e6fdd8d601736b..00a7b6a8dd4b304a4ab29d61a0e595f2e458620c 100644
--- a/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt
+++ b/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.txt
@@ -1,132 +1,134 @@
-layer at (0,0) size 785x2307
+layer at (0,0) size 785x2341
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2307
-  RenderBlock {HTML} at (0,0) size 785x2307
-    RenderBody {BODY} at (8,8) size 769x2291 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x2341
+  RenderBlock {HTML} at (0,0) size 785x2341
+    RenderBody {BODY} at (8,8) size 769x2325 [bgcolor=#CCCCCC]
       RenderBlock {P} at (0,0) size 769x18
         RenderText {#text} at (0,0) size 363x17
           text run at (0,0) width 363: "The style declarations which apply to the text below are:"
-      RenderBlock {PRE} at (0,34) size 769x270
-        RenderText {#text} at (0,0) size 523x270
-          text run at (0,0) width 336: "P.one {font-size: 14px; line-height: 20px;}"
-          text run at (335,0) width 1: " "
-          text run at (0,15) width 297: "IMG.onea {vertical-align: text-bottom;"
-          text run at (296,15) width 1: " "
-          text run at (0,30) width 266: "     width: 200px; height: 200px;}"
-          text run at (265,30) width 1: " "
-          text run at (0,45) width 508: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}"
-          text run at (507,45) width 1: " "
-          text run at (0,60) width 0: " "
-          text run at (0,75) width 336: "P.two {font-size: 14px; line-height: 20px;}"
-          text run at (335,75) width 1: " "
-          text run at (0,90) width 523: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;"
-          text run at (522,90) width 1: " "
-          text run at (0,105) width 305: "     padding: 5px; border-style: solid;"
-          text run at (304,105) width 1: " "
-          text run at (0,120) width 305: "     border-width: 10px; margin: 15px;}"
-          text run at (304,120) width 1: " "
-          text run at (0,135) width 274: "IMG.twob {vertical-align: text-top;"
-          text run at (273,135) width 1: " "
-          text run at (0,150) width 297: "          width: 100px; height: 100px;"
-          text run at (296,150) width 1: " "
-          text run at (0,165) width 305: "     padding: 5px; border-style: solid;"
-          text run at (304,165) width 1: " "
-          text run at (0,180) width 305: "     border-width: 10px; margin: 15px;}"
-          text run at (304,180) width 1: " "
-          text run at (0,195) width 0: " "
-          text run at (0,210) width 469: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;"
-          text run at (468,210) width 1: " "
-          text run at (0,225) width 305: "     padding: 5px; border-style: solid;"
-          text run at (304,225) width 1: " "
-          text run at (0,240) width 313: "     border-width: 10px; margin: -10px;}"
-          text run at (312,240) width 1: " "
-          text run at (0,255) width 0: " "
-      RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)]
-      RenderBlock {P} at (0,333) size 769x445
-        RenderText {#text} at (0,2) size 768x238
-          text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
-          text run at (412,2) width 345: "This means that the lines of text within it should be separated"
-          text run at (0,22) width 367: "by six pixels, three of which are part of the line-box of each line. "
-          text run at (366,22) width 402: "Any images within the paragraph should increase the height of the line-"
-          text run at (0,225) width 266: "box so that they fit within the line box, such as "
-        RenderImage {IMG} at (265.17,40) size 200x200
-        RenderText {#text} at (465,225) size 28x15
-          text run at (465,225) width 28: " and "
-        RenderImage {IMG} at (492.39,225) size 200x200
-        RenderText {#text} at (692,225) size 769x217
-          text run at (692,225) width 8: ". "
-          text run at (699,225) width 39: "This is"
-          text run at (0,427) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
-      RenderBlock {P} at (0,792) size 769x485
-        RenderText {#text} at (0,2) size 759x198
-          text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
-          text run at (412,2) width 345: "This means that the lines of text within it should be separated"
+      RenderBlock {PRE} at (0,34) size 769x288
+        RenderText {#text} at (0,0) size 536x288
+          text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}"
+          text run at (344,0) width 0: " "
+          text run at (0,16) width 304: "IMG.onea {vertical-align: text-bottom;"
+          text run at (304,16) width 0: " "
+          text run at (0,32) width 272: "     width: 200px; height: 200px;}"
+          text run at (272,32) width 0: " "
+          text run at (0,48) width 520: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}"
+          text run at (520,48) width 0: " "
+          text run at (0,64) width 0: " "
+          text run at (0,80) width 344: "P.two {font-size: 14px; line-height: 20px;}"
+          text run at (344,80) width 0: " "
+          text run at (0,96) width 536: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;"
+          text run at (536,96) width 0: " "
+          text run at (0,112) width 312: "     padding: 5px; border-style: solid;"
+          text run at (312,112) width 0: " "
+          text run at (0,128) width 312: "     border-width: 10px; margin: 15px;}"
+          text run at (312,128) width 0: " "
+          text run at (0,144) width 280: "IMG.twob {vertical-align: text-top;"
+          text run at (280,144) width 0: " "
+          text run at (0,160) width 304: "          width: 100px; height: 100px;"
+          text run at (304,160) width 0: " "
+          text run at (0,176) width 312: "     padding: 5px; border-style: solid;"
+          text run at (312,176) width 0: " "
+          text run at (0,192) width 312: "     border-width: 10px; margin: 15px;}"
+          text run at (312,192) width 0: " "
+          text run at (0,208) width 0: " "
+          text run at (0,224) width 480: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;"
+          text run at (480,224) width 0: " "
+          text run at (0,240) width 312: "     padding: 5px; border-style: solid;"
+          text run at (312,240) width 0: " "
+          text run at (0,256) width 320: "     border-width: 10px; margin: -10px;}"
+          text run at (320,256) width 0: " "
+          text run at (0,272) width 0: " "
+      RenderBlock {HR} at (0,335) size 769x2 [border: (1px inset #EEEEEE)]
+      RenderBlock {P} at (0,351) size 769x464
+        RenderText {#text} at (0,2) size 763x238
+          text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. "
+          text run at (417,2) width 346: "This means that the lines of text within it should be separated"
+          text run at (0,22) width 371: "by six pixels, three of which are part of the line-box of each line. "
+          text run at (371,22) width 373: "Any images within the paragraph should increase the height of the"
+          text run at (0,224) width 294: "line-box so that they fit within the line box, such as "
+        RenderImage {IMG} at (294,40) size 200x200
+        RenderText {#text} at (494,224) size 28x16
+          text run at (494,224) width 28: " and "
+        RenderImage {IMG} at (522,224) size 200x200
+        RenderText {#text} at (722,224) size 768x238
+          text run at (722,224) width 8: ". "
+          text run at (730,224) width 38: "This is"
+          text run at (0,426) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top"
+          text run at (0,446) width 43: "aligned."
+      RenderBlock {P} at (0,829) size 769x484
+        RenderText {#text} at (0,2) size 763x198
+          text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. "
+          text run at (417,2) width 346: "This means that the lines of text within it should be separated"
           text run at (0,22) width 78: "by six pixels. "
-          text run at (77,22) width 682: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px),"
-          text run at (0,185) width 351: "border (10px) and margins (15px) within the line box, such as "
-        RenderImage {IMG} at (365.70,55) size 130x130 [border: (10px solid #000000)]
-        RenderText {#text} at (510,185) size 28x15
-          text run at (510,185) width 28: " and "
-        RenderImage {IMG} at (552.91,200) size 130x130 [border: (10px solid #000000)]
-        RenderText {#text} at (697,185) size 769x256
-          text run at (697,185) width 8: ". "
-          text run at (704,185) width 39: "This is"
-          text run at (0,347) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
-          text run at (0,367) width 735: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom"
-          text run at (0,387) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px below"
-          text run at (0,426) width 103: "the top of the text "
-        RenderImage {IMG} at (92.25,395) size 80x80 [border: (10px solid #000000)]
-        RenderText {#text} at (162,426) size 737x56
-          text run at (162,426) width 8: ". "
-          text run at (169,426) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the"
-          text run at (0,467) width 374: "image in the vertical direction, and also in the horizontal direction."
-      RenderTable {TABLE} at (0,1291) size 769x1000 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 767x998
+          text run at (78,22) width 683: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px),"
+          text run at (0,184) width 357: "border (10px) and margins (15px) within the line box, such as "
+        RenderImage {IMG} at (372,55) size 130x130 [border: (10px solid #000000)]
+        RenderText {#text} at (517,184) size 28x16
+          text run at (517,184) width 28: " and "
+        RenderImage {IMG} at (560,199) size 130x130 [border: (10px solid #000000)]
+        RenderText {#text} at (705,184) size 768x256
+          text run at (705,184) width 8: ". "
+          text run at (713,184) width 38: "This is"
+          text run at (0,346) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top"
+          text run at (0,366) width 47: "aligned. "
+          text run at (47,366) width 700: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the"
+          text run at (0,386) width 768: "bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px"
+          text run at (0,424) width 143: "below the top of the text "
+        RenderImage {IMG} at (133,394) size 80x80 [border: (10px solid #000000)]
+        RenderText {#text} at (203,424) size 764x58
+          text run at (203,424) width 8: ". "
+          text run at (211,424) width 553: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward"
+          text run at (0,466) width 392: "the image in the vertical direction, and also in the horizontal direction."
+      RenderTable {TABLE} at (0,1327) size 769x998 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 767x996
           RenderTableRow {TR} at (0,0) size 767x26
             RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
               RenderInline {STRONG} at (0,0) size 163x17
                 RenderText {#text} at (4,4) size 163x17
                   text run at (4,4) width 163: "TABLE Testing Section"
-          RenderTableRow {TR} at (0,26) size 767x972
-            RenderTableCell {TD} at (0,499) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,26) size 767x970
+            RenderTableCell {TD} at (0,498) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x17
                 text run at (4,4) width 4: " "
-            RenderTableCell {TD} at (12,26) size 755x972 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-              RenderBlock {P} at (4,4) size 747x465
-                RenderText {#text} at (0,2) size 720x238
-                  text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
-                  text run at (412,2) width 288: "This means that the lines of text within it should be"
-                  text run at (0,22) width 423: "separated by six pixels, three of which are part of the line-box of each line. "
-                  text run at (422,22) width 298: "Any images within the paragraph should increase the"
-                  text run at (0,225) width 366: "height of the line-box so that they fit within the line box, such as "
-                RenderImage {IMG} at (365.09,40) size 200x200
-                RenderText {#text} at (565,225) size 28x15
-                  text run at (565,225) width 28: " and "
-                RenderImage {IMG} at (0,245) size 200x200
-                RenderText {#text} at (200,245) size 733x217
-                  text run at (200,245) width 7: ". "
-                  text run at (207,245) width 526: "This is additional text to make sure that there is enough room left below the image so that this"
-                  text run at (0,447) width 281: "line does not hit the image that is text-top aligned."
-              RenderBlock {P} at (4,483) size 747x485
-                RenderText {#text} at (0,2) size 729x198
-                  text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
-                  text run at (412,2) width 288: "This means that the lines of text within it should be"
+            RenderTableCell {TD} at (12,26) size 755x970 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock {P} at (4,4) size 747x464
+                RenderText {#text} at (0,2) size 726x238
+                  text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. "
+                  text run at (417,2) width 289: "This means that the lines of text within it should be"
+                  text run at (0,22) width 428: "separated by six pixels, three of which are part of the line-box of each line. "
+                  text run at (428,22) width 298: "Any images within the paragraph should increase the"
+                  text run at (0,224) width 369: "height of the line-box so that they fit within the line box, such as "
+                RenderImage {IMG} at (369,40) size 200x200
+                RenderText {#text} at (569,224) size 28x16
+                  text run at (569,224) width 28: " and "
+                RenderImage {IMG} at (0,244) size 200x200
+                RenderText {#text} at (200,244) size 738x218
+                  text run at (200,244) width 8: ". "
+                  text run at (208,244) width 530: "This is additional text to make sure that there is enough room left below the image so that this"
+                  text run at (0,446) width 280: "line does not hit the image that is text-top aligned."
+              RenderBlock {P} at (4,482) size 747x484
+                RenderText {#text} at (0,2) size 731x198
+                  text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. "
+                  text run at (417,2) width 289: "This means that the lines of text within it should be"
                   text run at (0,22) width 135: "separated by six pixels. "
-                  text run at (134,22) width 595: "Any images within the paragraph should increase the height of the line-box so that they fit, including their"
-                  text run at (0,185) width 437: "padding (5px), border (10px) and margins (15px) within the line box, such as "
-                RenderImage {IMG} at (451.63,55) size 130x130 [border: (10px solid #000000)]
-                RenderText {#text} at (596,185) size 28x15
-                  text run at (596,185) width 28: " and "
-                RenderImage {IMG} at (15,220) size 130x130 [border: (10px solid #000000)]
-                RenderText {#text} at (160,205) size 747x236
-                  text run at (160,205) width 7: ". "
-                  text run at (167,205) width 580: "This is additional text to make sure that there is enough room left below the image so that this line does"
-                  text run at (0,367) width 231: "not hit the image that is text-top aligned. "
-                  text run at (230,367) width 489: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this"
-                  text run at (0,387) width 735: "paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the second"
-                  text run at (0,426) width 367: "image the top border should begin 15px below the top of the text "
-                RenderImage {IMG} at (356.64,395) size 80x80 [border: (10px solid #000000)]
-                RenderText {#text} at (426,426) size 740x56
-                  text run at (426,426) width 8: ". "
-                  text run at (433,426) width 307: "The last image in this paragraph has -10px margins set"
-                  text run at (0,467) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."
+                  text run at (135,22) width 596: "Any images within the paragraph should increase the height of the line-box so that they fit, including their"
+                  text run at (0,184) width 444: "padding (5px), border (10px) and margins (15px) within the line box, such as "
+                RenderImage {IMG} at (459,55) size 130x130 [border: (10px solid #000000)]
+                RenderText {#text} at (604,184) size 28x16
+                  text run at (604,184) width 28: " and "
+                RenderImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)]
+                RenderText {#text} at (160,204) size 729x236
+                  text run at (160,204) width 8: ". "
+                  text run at (168,204) width 553: "This is additional text to make sure that there is enough room left below the image so that this line"
+                  text run at (0,366) width 261: "does not hit the image that is text-top aligned. "
+                  text run at (261,366) width 468: "It is the outer edge of the margin that should be text-bottom and text-top aligned in"
+                  text run at (0,386) width 728: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the"
+                  text run at (0,424) width 415: "second image the top border should begin 15px below the top of the text "
+                RenderImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)]
+                RenderText {#text} at (475,424) size 723x58
+                  text run at (475,424) width 8: ". "
+                  text run at (483,424) width 240: "The last image in this paragraph has -10px"
+                  text run at (0,466) width 705: "margins set on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."