Changeset 49567 in webkit

Timestamp:

Oct 14, 2009 9:26:38 AM (15 years ago)

Author:

Nate Chapin

Message:

2009-10-14 Victor Wang <​victorw@chromium.org>

Reviewed by David Hyatt.

Round non-integer line height values.

Change webkit to rounding non-integer line height values
instead of truncating them. This fixes a layout test
failure on Windows and matches the calculation in IE and Firefox.

​https://bugs.webkit.org/show_bug.cgi?id=24434

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (3 diffs)
• LayoutTests/css1/font_properties/font.html (modified) (2 diffs)
• LayoutTests/fast/css/line-height-rounding-expected.txt (added)
• LayoutTests/fast/css/line-height-rounding.html (added)
• LayoutTests/platform/mac/css1/font_properties/font-expected.txt (modified) (5 diffs)
• LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt (modified) (3 diffs)
• LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt (modified) (3 diffs)
• LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt (modified) (4 diffs)
• LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt (modified) (7 diffs)
• LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (35 diffs)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• WebCore/rendering/InlineFlowBox.cpp (modified) (1 diff)
• WebCore/rendering/RenderBR.cpp (modified) (1 diff)
• WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-14  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Round non-integer line height values and update layout tests affected.
+
+        -. Change webkit to rounding non-integer line height values
+           instead of truncating them. This fixes a layout test
+           failure on Windows and matches the calculation in IE and Firefox. 
+
+        -. Update layout tests affected by changing line height calculation.
+           Fix the font size in font.html. The font computed pixel size should
+           be 10px instead of 9.6px (computedPixelSize in FontDescription.h)
+           and line height should be 25, not 24.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24434
+
+        * css1/font_properties/font.html:
+        * fast/css/line-height-rounding-expected.txt: Added.
+        * fast/css/line-height-rounding.html: Added.
+        * platform/mac/css1/font_properties/font-expected.txt:
+        * platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt:
+        * platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
+        * platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt:
+        * platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt:
+        * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum:
+        * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png:
+        * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
+        * platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
+        * platform/mac/svg/custom/svg-fonts-in-html-expected.png:
+        * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
+
 2009-10-14  Brady Eidson  <beidson@apple.com>
 
@@ -6809 +6841 @@
         Reviewed by Dan Bernstein.
 
-        <rdar://problem/7047282> Safari crashes at WebCore::RenderMenuList::adjustInnerStyle() + 436
+        <rdar://problem/7047282> Safari crashes at WebCore::RenderMenuList::adjustInnerStyle() 436
 
         Test that changes the <select> from a popup to a list inside a mouse event handler.
@@ -12619 +12651 @@
 2009-08-05  Xan Lopez  <xlopez@igalia.com>
 
-        Skip new test using eventSender, since the GTK+ port does not have
+        Skip new test using eventSender, since the GTKport does not have
         it yet.
 

trunk/LayoutTests/css1/font_properties/font.html

@@ -69 +69 @@
 </P>
 <P class="ten">
-This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px.  Extra text is included for the purposes of testing this more effectively.
+This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px.  Extra text is included for the purposes of testing this more effectively.
 </P>
 
@@ -115 +115 @@
 </P>
 <P class="ten">
-This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px.  Extra text is included for the purposes of testing this more effectively.
+This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px.  Extra text is included for the purposes of testing this more effectively.
 </P>
 

trunk/LayoutTests/platform/mac/css1/font_properties/font-expected.txt

@@ -1 @@
-layer at (0,0) size 785x4266
+layer at (0,0) size 785x4268
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x4266
-  RenderBlock {HTML} at (0,0) size 785x4266
-    RenderBody {BODY} at (8,8) size 769x4250 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x4268
+  RenderBlock {HTML} at (0,0) size 785x4268
+    RenderBody {BODY} at (8,8) size 769x4252 [bgcolor=#CCCCCC]
       RenderBlock {P} at (0,0) size 769x14
         RenderText {#text} at (0,0) size 264x14
@@ -107 +107 @@
           text run at (0,115) width 93: "effectively."
       RenderBlock {P} at (0,1519) size 769x50
-        RenderText {#text} at (0,6) size 754x37
+        RenderText {#text} at (0,6) size 751x37
           text run at (0,6) width 301: "This element should be in a sans-serif font, with a weight of 400. "
-          text run at (301,6) width 453: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px."
+          text run at (301,6) width 450: "Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px."
           text run at (0,31) width 318: "Extra text is included for the purposes of testing this more effectively."
       RenderBlock {P} at (0,1587) size 769x216
@@ -120 +120 @@
             text run at (0,178) width 679: "on an inline element and should therefore only cover the text, not the interline spacing."
         RenderText {#text} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,1821) size 769x2429 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 767x2427
+      RenderTable {TABLE} at (0,1821) size 769x2431 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 767x2429
           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]
@@ -127 +127 @@
                 RenderText {#text} at (4,4) size 163x18
                   text run at (4,4) width 163: "TABLE Testing Section"
-          RenderTableRow {TR} at (0,26) size 767x2401
-            RenderTableCell {TD} at (0,1213) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,26) size 767x2403
+            RenderTableCell {TD} at (0,1214) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x18
                 text run at (4,4) width 4: " "
-            RenderTableCell {TD} at (12,26) size 755x2401 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (12,26) size 755x2403 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
               RenderBlock {P} at (4,4) size 747x36
                 RenderText {#text} at (0,0) size 732x36
@@ -209 +209 @@
                   text run at (176,79) width 500: "Extra text is included for the purposes of testing this more"
                   text run at (0,115) width 93: "effectively."
-              RenderBlock {P} at (4,1877) size 747x64
-                RenderText {#text} at (0,8) size 714x47
-                  text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. "
-                  text run at (378,8) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-"
-                  text run at (0,40) width 235: "height shoud be 2.5 times that, or 24px. "
-                  text run at (235,40) width 405: "Extra text is included for the purposes of testing this more effectively."
-              RenderBlock {P} at (4,1965) size 747x432
+              RenderBlock {P} at (4,1877) size 747x66
+                RenderText {#text} at (0,9) size 745x48
+                  text run at (0,9) width 378: "This element should be in a sans-serif font, with a weight of 400. "
+                  text run at (378,9) width 367: "Its font-size should be 80% of 12px, or 10px, and its line-height"
+                  text run at (0,42) width 196: "shoud be 2.5 times that, or 25px. "
+                  text run at (196,42) width 405: "Extra text is included for the purposes of testing this more effectively."
+              RenderBlock {P} at (4,1967) size 747x432
                 RenderInline {SPAN} at (0,0) size 716x388 [bgcolor=#C0C0C0]
                   RenderText {#text} at (0,22) size 716x388

trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x484
-  RenderBlock {HTML} at (0,0) size 800x484
-    RenderBody {BODY} at (8,16) size 784x452
+layer at (0,0) size 800x501
+  RenderBlock {HTML} at (0,0) size 800x501
+    RenderBody {BODY} at (8,16) size 784x469
       RenderBlock {P} at (0,0) size 784x54 [color=#000080]
         RenderText {#text} at (0,0) size 778x54
@@ -13 +13 @@
           text run at (0,36) width 111: "the bottom of the "
           text run at (111,36) width 137: "respective small box)."
-      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
+      RenderBlock {DIV} at (16,70) size 752x399 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (171,22) size 474x18
           text run at (171,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
@@ -21 +21 @@
         RenderText {#text} at (663,22) size 4x18
           text run at (663,22) width 4: " "
-        RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+        RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
           RenderText {#text} at (19,20) size 48x18
             text run at (19,20) width 48: "AAAA"
-        RenderText {#text} at (667,22) size 544x38
+        RenderText {#text} at (667,22) size 544x39
           text run at (667,22) width 48: "dummy"
-          text run at (171,42) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (171,43) width 422: "text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 17x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
-          RenderText {#text} at (596,42) size 11x18
-            text run at (596,42) width 11: "B"
-        RenderText {#text} at (610,42) size 4x18
-          text run at (610,42) width 4: " "
-        RenderBlock (floating) {P} at (581,61) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+          RenderText {#text} at (596,43) size 11x18
+            text run at (596,43) width 11: "B"
+        RenderText {#text} at (610,43) size 4x18
+          text run at (610,43) width 4: " "
+        RenderBlock (floating) {P} at (581,63) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
           RenderText {#text} at (19,20) size 44x18
             text run at (19,20) width 44: "BBBB"
-        RenderText {#text} at (614,42) size 707x318
-          text run at (614,42) width 75: "dummy text"
-          text run at (171,62) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,82) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,82) width 75: "dummy text"
-          text run at (21,102) width 395: "dummy text dummy text dummy text dummy text dummy text "
-          text run at (416,102) width 154: "dummy text dummy text"
-          text run at (21,122) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,122) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,142) width 79: "dummy text "
-          text run at (100,142) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,142) width 154: "dummy text dummy text"
-          text run at (21,162) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,182) width 79: "dummy text "
-          text run at (100,182) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,182) width 154: "dummy text dummy text"
-          text run at (21,202) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,202) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,222) width 79: "dummy text "
-          text run at (100,222) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,222) width 154: "dummy text dummy text"
-          text run at (21,242) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,242) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,262) width 79: "dummy text "
-          text run at (100,262) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,262) width 154: "dummy text dummy text"
-          text run at (21,282) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,282) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,302) width 79: "dummy text "
-          text run at (100,302) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,302) width 154: "dummy text dummy text"
-          text run at (21,322) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,322) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,342) width 75: "dummy text"
+        RenderText {#text} at (614,43) size 707x333
+          text run at (614,43) width 75: "dummy text"
+          text run at (171,64) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,85) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,85) width 75: "dummy text"
+          text run at (21,106) width 395: "dummy text dummy text dummy text dummy text dummy text "
+          text run at (416,106) width 154: "dummy text dummy text"
+          text run at (21,127) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,127) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,148) width 79: "dummy text "
+          text run at (100,148) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,148) width 154: "dummy text dummy text"
+          text run at (21,169) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,169) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,190) width 79: "dummy text "
+          text run at (100,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,190) width 154: "dummy text dummy text"
+          text run at (21,211) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,211) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,232) width 79: "dummy text "
+          text run at (100,232) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,232) width 154: "dummy text dummy text"
+          text run at (21,253) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,253) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,274) width 79: "dummy text "
+          text run at (100,274) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,274) width 154: "dummy text dummy text"
+          text run at (21,295) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,295) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,316) width 79: "dummy text "
+          text run at (100,316) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,316) width 154: "dummy text dummy text"
+          text run at (21,337) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,337) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,358) width 75: "dummy text"

trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x484
-  RenderBlock {HTML} at (0,0) size 800x484
-    RenderBody {BODY} at (8,16) size 784x452
+layer at (0,0) size 800x503
+  RenderBlock {HTML} at (0,0) size 800x503
+    RenderBody {BODY} at (8,16) size 784x471
       RenderBlock {P} at (0,0) size 784x54 [color=#000080]
         RenderText {#text} at (0,0) size 769x54
@@ -13 +13 @@
           text run at (0,36) width 104: "respective small "
           text run at (104,36) width 33: "box)."
-      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
-        RenderText {#text} at (133,22) size 474x18
-          text run at (133,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+      RenderBlock {DIV} at (16,70) size 752x401 [color=#C0C0C0] [border: (5px solid #800080)]
+        RenderText {#text} at (133,23) size 474x18
+          text run at (133,23) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
-          RenderText {#text} at (610,22) size 16x18
-            text run at (610,22) width 16: "\x{21E6}"
-        RenderText {#text} at (629,22) size 4x18
-          text run at (629,22) width 4: " "
+          RenderText {#text} at (610,23) size 16x18
+            text run at (610,23) width 16: "\x{21E6}"
+        RenderText {#text} at (629,23) size 4x18
+          text run at (629,23) width 4: " "
         RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000]
-        RenderText {#text} at (633,22) size 575x38
-          text run at (633,22) width 75: "dummy text"
-          text run at (133,42) width 395: "dummy text dummy text dummy text dummy text dummy text "
+        RenderText {#text} at (633,23) size 575x40
+          text run at (633,23) width 75: "dummy text"
+          text run at (133,45) width 395: "dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
-          RenderText {#text} at (531,42) size 16x18
-            text run at (531,42) width 16: "\x{21E8}"
-        RenderText {#text} at (550,42) size 4x18
-          text run at (550,42) width 4: " "
-        RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000]
-        RenderText {#text} at (554,42) size 707x318
-          text run at (554,42) width 48: "dummy"
-          text run at (133,62) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-          text run at (555,62) width 48: "dummy"
-          text run at (133,82) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-          text run at (555,82) width 48: "dummy"
-          text run at (133,102) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-          text run at (555,102) width 48: "dummy"
-          text run at (133,122) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-          text run at (555,122) width 48: "dummy"
-          text run at (21,142) width 422: "text dummy text dummy text dummy text dummy text dummy text "
-          text run at (443,142) width 154: "dummy text dummy text"
-          text run at (21,162) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,182) width 79: "dummy text "
-          text run at (100,182) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,182) width 154: "dummy text dummy text"
-          text run at (21,202) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,202) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,222) width 79: "dummy text "
-          text run at (100,222) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,222) width 154: "dummy text dummy text"
-          text run at (21,242) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,242) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,262) width 79: "dummy text "
-          text run at (100,262) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,262) width 154: "dummy text dummy text"
-          text run at (21,282) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,282) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,302) width 79: "dummy text "
-          text run at (100,302) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (574,302) width 154: "dummy text dummy text"
-          text run at (21,322) width 316: "dummy text dummy text dummy text dummy text "
-          text run at (337,322) width 391: "dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,342) width 75: "dummy text"
+          RenderText {#text} at (531,45) size 16x18
+            text run at (531,45) width 16: "\x{21E8}"
+        RenderText {#text} at (550,45) size 4x18
+          text run at (550,45) width 4: " "
+        RenderImage {IMG} at (619,43) size 112x112 [color=#FF0000]
+        RenderText {#text} at (554,45) size 707x333
+          text run at (554,45) width 48: "dummy"
+          text run at (133,66) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (555,66) width 48: "dummy"
+          text run at (133,87) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (555,87) width 48: "dummy"
+          text run at (133,108) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (555,108) width 48: "dummy"
+          text run at (133,129) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (555,129) width 48: "dummy"
+          text run at (21,150) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+          text run at (443,150) width 154: "dummy text dummy text"
+          text run at (21,171) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,171) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,192) width 79: "dummy text "
+          text run at (100,192) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,192) width 154: "dummy text dummy text"
+          text run at (21,213) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,213) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,234) width 79: "dummy text "
+          text run at (100,234) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,234) width 154: "dummy text dummy text"
+          text run at (21,255) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,255) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,276) width 79: "dummy text "
+          text run at (100,276) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,276) width 154: "dummy text dummy text"
+          text run at (21,297) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,297) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,318) width 79: "dummy text "
+          text run at (100,318) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (574,318) width 154: "dummy text dummy text"
+          text run at (21,339) width 316: "dummy text dummy text dummy text dummy text "
+          text run at (337,339) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,360) width 75: "dummy text"

trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x544
-  RenderBlock {HTML} at (0,0) size 800x544
-    RenderBody {BODY} at (8,16) size 784x512
+layer at (0,0) size 800x564
+  RenderBlock {HTML} at (0,0) size 800x564
+    RenderBody {BODY} at (8,16) size 784x532
       RenderBlock {P} at (0,0) size 784x54 [color=#000080]
         RenderText {#text} at (0,0) size 778x54
@@ -13 +13 @@
           text run at (0,36) width 121: "possible below the "
           text run at (121,36) width 70: "small box)."
-      RenderBlock {DIV} at (16,70) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)]
+      RenderBlock {DIV} at (16,70) size 752x462 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (21,22) size 553x18
           text run at (21,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
@@ -22 +22 @@
         RenderText {#text} at (592,22) size 4x18
           text run at (592,22) width 4: " "
-        RenderBlock (floating) {P} at (21,41) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+        RenderBlock (floating) {P} at (21,42) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
           RenderText {#text} at (19,20) size 48x18
             text run at (19,20) width 48: "AAAA"
-        RenderText {#text} at (596,22) size 552x38
+        RenderText {#text} at (596,22) size 552x39
           text run at (596,22) width 127: "dummy text dummy"
-          text run at (171,42) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (171,43) width 343: "text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 14x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
-          RenderText {#text} at (517,42) size 11x18
-            text run at (517,42) width 11: "B"
+          RenderText {#text} at (517,43) size 11x18
+            text run at (517,43) width 11: "B"
         RenderText {#text} at (0,0) size 0x0
-        RenderBlock (floating) {P} at (581,41) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+        RenderBlock (floating) {P} at (581,42) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
           RenderText {#text} at (19,20) size 44x18
             text run at (19,20) width 44: "BBBB"
-        RenderText {#text} at (321,62) size 237x18
-          text run at (321,62) width 237: "dummy text dummy text dummy text "
+        RenderText {#text} at (321,64) size 237x18
+          text run at (321,64) width 237: "dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 14x24 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
-          RenderText {#text} at (561,62) size 11x18
-            text run at (561,62) width 11: "C"
+          RenderText {#text} at (561,64) size 11x18
+            text run at (561,64) width 11: "C"
         RenderText {#text} at (0,0) size 0x0
-        RenderBlock (floating) {P} at (171,61) size 150x58 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
+        RenderBlock (floating) {P} at (171,63) size 150x59 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
           RenderText {#text} at (19,20) size 44x18
             text run at (19,20) width 44: "CCCC"
-        RenderText {#text} at (321,82) size 387x38
-          text run at (321,82) width 233: "dummy text dummy text dummy text"
-          text run at (471,102) width 237: "dummy text dummy text dummy text "
+        RenderText {#text} at (321,85) size 387x39
+          text run at (321,85) width 233: "dummy text dummy text dummy text"
+          text run at (471,106) width 237: "dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 15x24 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
-          RenderText {#text} at (711,102) size 12x18
-            text run at (711,102) width 12: "D"
+          RenderText {#text} at (711,106) size 12x18
+            text run at (711,106) width 12: "D"
         RenderText {#text} at (0,0) size 0x0
-        RenderBlock (floating) {P} at (321,101) size 150x58 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
+        RenderBlock (floating) {P} at (321,105) size 150x59 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
           RenderText {#text} at (19,20) size 48x18
             text run at (19,20) width 48: "DDDD"
-        RenderText {#text} at (471,122) size 707x298
-          text run at (471,122) width 233: "dummy text dummy text dummy text"
-          text run at (471,142) width 233: "dummy text dummy text dummy text"
-          text run at (21,162) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,162) width 233: "dummy text dummy text dummy text"
-          text run at (21,182) width 237: "dummy text dummy text dummy text "
-          text run at (258,182) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,202) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,202) width 233: "dummy text dummy text dummy text"
-          text run at (21,222) width 237: "dummy text dummy text dummy text "
-          text run at (258,222) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,242) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,242) width 233: "dummy text dummy text dummy text"
-          text run at (21,262) width 237: "dummy text dummy text dummy text "
-          text run at (258,262) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,282) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,282) width 233: "dummy text dummy text dummy text"
-          text run at (21,302) width 237: "dummy text dummy text dummy text "
-          text run at (258,302) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,322) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,322) width 233: "dummy text dummy text dummy text"
-          text run at (21,342) width 237: "dummy text dummy text dummy text "
-          text run at (258,342) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,362) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (495,362) width 233: "dummy text dummy text dummy text"
-          text run at (21,382) width 237: "dummy text dummy text dummy text "
-          text run at (258,382) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
-          text run at (21,402) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+        RenderText {#text} at (471,127) size 707x312
+          text run at (471,127) width 233: "dummy text dummy text dummy text"
+          text run at (471,148) width 233: "dummy text dummy text dummy text"
+          text run at (21,169) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,169) width 233: "dummy text dummy text dummy text"
+          text run at (21,190) width 237: "dummy text dummy text dummy text "
+          text run at (258,190) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,211) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,211) width 233: "dummy text dummy text dummy text"
+          text run at (21,232) width 237: "dummy text dummy text dummy text "
+          text run at (258,232) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,253) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,253) width 233: "dummy text dummy text dummy text"
+          text run at (21,274) width 237: "dummy text dummy text dummy text "
+          text run at (258,274) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,295) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,295) width 233: "dummy text dummy text dummy text"
+          text run at (21,316) width 237: "dummy text dummy text dummy text "
+          text run at (258,316) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,337) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,337) width 233: "dummy text dummy text dummy text"
+          text run at (21,358) width 237: "dummy text dummy text dummy text "
+          text run at (258,358) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,379) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (495,379) width 233: "dummy text dummy text dummy text"
+          text run at (21,400) width 237: "dummy text dummy text dummy text "
+          text run at (258,400) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
+          text run at (21,421) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"

trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt

@@ -1 +1 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x464
-  RenderBlock {HTML} at (0,0) size 800x464
-    RenderBody {BODY} at (8,16) size 784x432
+layer at (0,0) size 800x480
+  RenderBlock {HTML} at (0,0) size 800x480
+    RenderBody {BODY} at (8,16) size 784x448
       RenderBlock {P} at (0,0) size 784x54 [color=#000080]
         RenderText {#text} at (0,0) size 778x54
@@ -13 +13 @@
           text run at (0,36) width 121: "possible below the "
           text run at (121,36) width 70: "small box)."
-      RenderBlock {DIV} at (16,70) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)]
+      RenderBlock {DIV} at (16,70) size 752x378 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (171,22) size 316x18
           text run at (171,22) width 316: "dummy text dummy text dummy text dummy text "
@@ -21 +21 @@
         RenderText {#text} at (505,22) size 4x18
           text run at (505,22) width 4: " "
-        RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+        RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
           RenderText {#text} at (19,20) size 48x18
             text run at (19,20) width 48: "AAAA"
@@ -30 +30 @@
         RenderText {#text} at (526,22) size 4x18
           text run at (526,22) width 4: " "
-        RenderBlock (floating) {P} at (581,21) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+        RenderBlock (floating) {P} at (581,21) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
           RenderText {#text} at (19,20) size 44x18
             text run at (19,20) width 44: "BBBB"
-        RenderText {#text} at (530,22) size 707x318
+        RenderText {#text} at (530,22) size 707x333
           text run at (530,22) width 48: "dummy"
-          text run at (171,42) width 391: "text dummy text dummy text dummy text dummy text dummy"
-          text run at (171,62) width 27: "text "
-          text run at (198,62) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,82) width 106: "text dummy text "
-          text run at (127,82) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,82) width 127: "dummy text dummy"
-          text run at (21,102) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,102) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,122) width 106: "text dummy text "
-          text run at (127,122) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,122) width 127: "dummy text dummy"
-          text run at (21,142) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,142) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,162) width 106: "text dummy text "
-          text run at (127,162) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,162) width 127: "dummy text dummy"
-          text run at (21,182) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,182) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,202) width 106: "text dummy text "
-          text run at (127,202) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,202) width 127: "dummy text dummy"
-          text run at (21,222) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,222) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,242) width 106: "text dummy text "
-          text run at (127,242) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,242) width 127: "dummy text dummy"
-          text run at (21,262) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,262) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,282) width 106: "text dummy text "
-          text run at (127,282) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-          text run at (601,282) width 127: "dummy text dummy"
-          text run at (21,302) width 343: "text dummy text dummy text dummy text dummy text "
-          text run at (364,302) width 364: "dummy text dummy text dummy text dummy text dummy"
-          text run at (21,322) width 102: "text dummy text"
+          text run at (171,43) width 391: "text dummy text dummy text dummy text dummy text dummy"
+          text run at (171,64) width 27: "text "
+          text run at (198,64) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,85) width 106: "text dummy text "
+          text run at (127,85) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,85) width 127: "dummy text dummy"
+          text run at (21,106) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,106) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,127) width 106: "text dummy text "
+          text run at (127,127) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,127) width 127: "dummy text dummy"
+          text run at (21,148) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,148) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,169) width 106: "text dummy text "
+          text run at (127,169) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,169) width 127: "dummy text dummy"
+          text run at (21,190) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,190) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,211) width 106: "text dummy text "
+          text run at (127,211) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,211) width 127: "dummy text dummy"
+          text run at (21,232) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,232) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,253) width 106: "text dummy text "
+          text run at (127,253) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,253) width 127: "dummy text dummy"
+          text run at (21,274) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,274) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,295) width 106: "text dummy text "
+          text run at (127,295) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
+          text run at (601,295) width 127: "dummy text dummy"
+          text run at (21,316) width 343: "text dummy text dummy text dummy text dummy text "
+          text run at (364,316) width 364: "dummy text dummy text dummy text dummy text dummy"
+          text run at (21,337) width 102: "text dummy text"

trunk/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum

@@ -1 @@
-02d6337b033863d06052de3b78597d86
+53f3eb75f9a6563791fa4d8613d7f46c

trunk/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -1 @@
-layer at (0,0) size 1026x1014
+layer at (0,0) size 1026x1035
   RenderView at (0,0) size 785x585
-layer at (0,0) size 1026x1014
-  RenderBlock {HTML} at (0,0) size 785x1014
-    RenderBody {BODY} at (8,16) size 769x994
-      RenderBlock {DIV} at (16,0) size 737x60
-        RenderBlock {P} at (0,0) size 737x20
+layer at (0,0) size 1026x1035
+  RenderBlock {HTML} at (0,0) size 785x1035
+    RenderBody {BODY} at (8,16) size 769x1015
+      RenderBlock {DIV} at (16,0) size 737x63
+        RenderBlock {P} at (0,0) size 737x21
           RenderInline {A} at (0,0) size 90x18 [color=#0000EE]
             RenderText {#text} at (267,1) size 90x18
@@ -14 +14 @@
             RenderText {#text} at (368,1) size 102x18
               text run at (368,1) width 102: "Basic version"
-        RenderBlock {P} at (0,20) size 737x20
+        RenderBlock {P} at (0,21) size 737x21
           RenderText {#text} at (182,1) size 143x18
             text run at (182,1) width 143: "Specification link: "
@@ -20 +20 @@
             RenderText {#text} at (325,1) size 230x18
               text run at (325,1) width 230: "3.4 How groups are rendered"
-        RenderBlock {P} at (0,40) size 737x20
+        RenderBlock {P} at (0,42) size 737x21
           RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
             RenderText {#text} at (148,1) size 206x18
@@ -35 +35 @@
               text run at (408,1) width 180: "\x{2192} script-handle-01-b"
           RenderText {#text} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,64) size 1018x550
-        RenderTableSection {TBODY} at (0,0) size 1018x550
-          RenderTableRow {TR} at (0,0) size 1018x550
-            RenderTableCell {TD} at (0,0) size 1018x550 [r=0 c=0 rs=1 cs=3]
-              RenderTable {TABLE} at (10,10) size 998x530
-                RenderTableSection {TBODY} at (0,0) size 998x530
+      RenderTable {TABLE} at (0,67) size 1018x552
+        RenderTableSection {TBODY} at (0,0) size 1018x552
+          RenderTableRow {TR} at (0,0) size 1018x552
+            RenderTableCell {TD} at (0,0) size 1018x552 [r=0 c=0 rs=1 cs=3]
+              RenderTable {TABLE} at (10,10) size 998x532
+                RenderTableSection {TBODY} at (0,0) size 998x532
                   RenderTableRow {TR} at (0,2) size 998x106
                     RenderTableCell {TD} at (2,2) size 994x106 [r=0 c=0 rs=1 cs=2]
@@ -46 +46 @@
                         RenderText {#text} at (312,5) size 354x38
                           text run at (312,5) width 354: "render-groups-01-b"
-                  RenderTableRow {TR} at (0,110) size 998x36 [color=#FFFFFF] [bgcolor=#000000]
-                    RenderTableCell {TD} at (2,110) size 496x36 [r=1 c=0 rs=1 cs=1]
+                  RenderTableRow {TR} at (0,110) size 998x37 [color=#FFFFFF] [bgcolor=#000000]
+                    RenderTableCell {TD} at (2,110) size 496x37 [r=1 c=0 rs=1 cs=1]
                       RenderText {#text} at (203,9) size 89x18
                         text run at (203,9) width 89: "SVG Image"
-                    RenderTableCell {TD} at (500,110) size 496x36 [r=1 c=1 rs=1 cs=1]
+                    RenderTableCell {TD} at (500,110) size 496x37 [r=1 c=1 rs=1 cs=1]
                       RenderText {#text} at (202,9) size 91x18
                         text run at (202,9) width 91: "PNG Image"
-                  RenderTableRow {TR} at (0,148) size 998x380
-                    RenderTableCell {TD} at (2,148) size 496x380 [r=2 c=0 rs=1 cs=1]
+                  RenderTableRow {TR} at (0,149) size 998x381
+                    RenderTableCell {TD} at (2,149) size 496x381 [r=2 c=0 rs=1 cs=1]
                       RenderPartObject {EMBED} at (8,8) size 480x360
                         layer at (0,0) size 480x360
@@ -84 +84 @@
                             RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
                       RenderText {#text} at (0,0) size 0x0
-                    RenderTableCell {TD} at (500,148) size 496x380 [r=2 c=1 rs=1 cs=1]
+                    RenderTableCell {TD} at (500,149) size 496x381 [r=2 c=1 rs=1 cs=1]
                       RenderImage {IMG} at (8,8) size 480x360
                       RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (23,625) size 723x333
-        RenderBlock {P} at (0,0) size 723x40
-          RenderText {#text} at (0,1) size 720x38
+      RenderBlock {DIV} at (23,630) size 723x348
+        RenderBlock {P} at (0,0) size 723x42
+          RenderText {#text} at (0,1) size 720x39
             text run at (0,1) width 720: "Verifies implicit rendering order (paragraph 3.3) and grouping mechanism (paragraphs 3.4)."
-            text run at (0,21) width 433: "It also validates basic Shape, Image and text rendering."
-        RenderBlock {P} at (0,51) size 723x160
-          RenderText {#text} at (0,1) size 711x158
+            text run at (0,22) width 433: "It also validates basic Shape, Image and text rendering."
+        RenderBlock {P} at (0,53) size 723x168
+          RenderText {#text} at (0,1) size 711x165
             text run at (0,1) width 154: "This test renders 3 "
             text run at (154,1) width 275: "elements: a text string \"SVG\", then "
             text run at (429,1) width 276: "a shape, then an image. Because of"
-            text run at (0,21) width 386: "their definition order and coordinates, the image "
-            text run at (386,21) width 325: "should be on top of the rectangle and the"
-            text run at (0,41) width 259: "rectangle on top of the text. The "
-            text run at (259,41) width 408: "test validates that groups are conceptually rendered"
-            text run at (0,61) width 183: "offscreen before being "
-            text run at (183,61) width 464: "rendered on the canvas. This is done by grouping the same"
-            text run at (0,81) width 193: "overlapping objects and "
-            text run at (193,81) width 473: "rendering the group at half opacity. The background pattern"
-            text run at (0,101) width 188: "(vertical stripes) should "
-            text run at (188,101) width 498: "show throw all the group elements. However, none of the \"SVG\""
-            text run at (0,121) width 202: "should show through the "
-            text run at (202,121) width 480: "rectangle and none of the rectangle should show through the"
-            text run at (0,141) width 53: "image."
-        RenderBlock {P} at (0,222) size 723x80
-          RenderText {#text} at (0,1) size 718x78
+            text run at (0,22) width 386: "their definition order and coordinates, the image "
+            text run at (386,22) width 325: "should be on top of the rectangle and the"
+            text run at (0,43) width 259: "rectangle on top of the text. The "
+            text run at (259,43) width 408: "test validates that groups are conceptually rendered"
+            text run at (0,64) width 183: "offscreen before being "
+            text run at (183,64) width 464: "rendered on the canvas. This is done by grouping the same"
+            text run at (0,85) width 193: "overlapping objects and "
+            text run at (193,85) width 473: "rendering the group at half opacity. The background pattern"
+            text run at (0,106) width 188: "(vertical stripes) should "
+            text run at (188,106) width 498: "show throw all the group elements. However, none of the \"SVG\""
+            text run at (0,127) width 202: "should show through the "
+            text run at (202,127) width 480: "rectangle and none of the rectangle should show through the"
+            text run at (0,148) width 53: "image."
+        RenderBlock {P} at (0,232) size 723x84
+          RenderText {#text} at (0,1) size 718x81
             text run at (0,1) width 626: "Prerequisites: the test assumes proper handling of the fill stroke, stroke-width, "
             text run at (626,1) width 61: "opacity,"
-            text run at (0,21) width 641: "font-size rendering properties. It uses the rect, line, text and image elements, as "
-            text run at (641,21) width 77: "well as all"
-            text run at (0,41) width 603: "the elements required for the test template. To ensure that the text string is "
-            text run at (603,41) width 111: "overlapped by"
-            text run at (0,61) width 661: "the other elements and to avoid a dependency on system fonts, an SVG font is used."
-        RenderBlock {P} at (0,313) size 723x20
+            text run at (0,22) width 641: "font-size rendering properties. It uses the rect, line, text and image elements, as "
+            text run at (641,22) width 77: "well as all"
+            text run at (0,43) width 603: "the elements required for the test template. To ensure that the text string is "
+            text run at (603,43) width 111: "overlapped by"
+            text run at (0,64) width 661: "the other elements and to avoid a dependency on system fonts, an SVG font is used."
+        RenderBlock {P} at (0,327) size 723x21
           RenderText {#text} at (0,1) size 494x18
             text run at (0,1) width 494: "The rendered image should match the reference image exactly."
-      RenderBlock {DIV} at (16,974) size 737x20
-        RenderBlock {P} at (0,0) size 737x20
+      RenderBlock {DIV} at (16,994) size 737x21
+        RenderBlock {P} at (0,0) size 737x21
           RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
             RenderText {#text} at (148,1) size 206x18
@@ -138 +138 @@
               text run at (408,1) width 180: "\x{2192} script-handle-01-b"
           RenderText {#text} at (0,0) size 0x0
-scrolled to 0,429
+scrolled to 0,450

trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum

@@ -1 @@
-81565beca8cbbefe41ef1bd6a16ee351
+4cf3848efefdd7b4d77a0d1f1b49e079

trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt

@@ -20 +20 @@
     RenderBlock {DIV} at (0,0) size 453x0
       RenderInline {SPAN} at (0,0) size 0x0
-layer at (173,47) size 453x189
-  RenderBlock (positioned) {H1} at (0,15) size 453x188 [color=#DD9955]
-    RenderInline {SPAN} at (0,0) size 340x190
-      RenderText {#text} at (63,-1) size 340x190
-        text run at (63,-1) width 327: "CSS ZEN"
-        text run at (56,93) width 340: "GARDEN"
+layer at (173,47) size 453x191
+  RenderBlock (positioned) {H1} at (0,15) size 453x190 [color=#DD9955]
+    RenderInline {SPAN} at (0,0) size 340x191
+      RenderText {#text} at (63,0) size 340x191
+        text run at (63,0) width 327: "CSS ZEN"
+        text run at (56,95) width 340: "GARDEN"
 layer at (173,118) size 453x20
   RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00]

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-14  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Round non-integer line height values.
+
+        Change webkit to rounding non-integer line height values
+        instead of truncating them. This fixes a layout test
+        failure on Windows and matches the calculation in IE and Firefox. 
+
+        https://bugs.webkit.org/show_bug.cgi?id=24434
+
+        Test: fast/css/line-height-rounding.html
+              fast/forms/textarea-scrollbar-height.htm
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
+        * rendering/RenderBR.cpp:
+        (WebCore::RenderBR::lineHeight):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::computedLineHeight):
+
 2009-10-13  Kelly Norton  <knorton@google.com>
 
@@ -1070 +1094 @@
         is 512K on ia32 or 1M on x64, but the worker process runs workers
         on a thread with the OS X default stack size--512K. Because there
-        are already some C++ frames on the stack when V8 establishes its
+        are already some C+frames on the stack when V8 establishes its
         512K default stack limit, and V8 doesn't precisely enforce the
         stack limit, runaway recursion in V8 workers overflows the OS
@@ -1078 +1102 @@
         This patch sets the V8 stack limit for worker JavaScript in
         Chromium to a more conservative 500K on all platforms. This allows
-        some "headroom" for the C++ stack in use when the limit is set up,
+        some "headroom" for the C+stack in use when the limit is set up,
         and some "legroom" for the V8 helper functions which in practice
         briefly flout the V8 stack limit.
@@ -1112 +1136 @@
 
         * bindings/scripts/CodeGenerator.pm: Add a function to determine the
-        appropriate C++ namespace for attribute name constants.
+        appropriate C+namespace for attribute name constants.
         * bindings/scripts/CodeGeneratorObjC.pm: Generate ExceptionCode handling
         code for [Reflect] on an attribute with a setter exception.
@@ -2250 +2274 @@
 2009-10-07  Xan Lopez  <xlopez@igalia.com>
 
-        Fix more breakage in the GTK+ build.
+        Fix more breakage in the GTKbuild.
 
         * GNUmakefile.am:
@@ -2696 +2720 @@
         Reviewed by Adam Barth.
 
-        Fetch pointers to C++ DOM window immediately from holder
+        Fetch pointers to C+DOM window immediately from holder
         object (do not search prototype chain for proper JS wrapper).
         https://bugs.webkit.org/show_bug.cgi?id=29031
@@ -2886 +2910 @@
 2009-10-06  Xan Lopez  <xlopez@igalia.com>
 
-        Try to fix the GTK+ build.
+        Try to fix the GTKbuild.
 
         * GNUmakefile.am:
@@ -5779 +5803 @@
 
         auto = optimizeSpeed = what we normally when the value's not set
-        optimizeLegibility = geometricPrecision = ligatures + kerning
+        optimizeLegibility = geometricPrecision = ligatures kerning
 
         Add new file TextRenderingMode.h to the project files.
@@ -5939 +5963 @@
            prevent listeners from being collected.
          o All variats of getEventListener function grouped in V8DOMWrapper.
-         o Pointers to C++ EventListener wrappers are stored in JS objects
+         o Pointers to C+EventListener wrappers are stored in JS objects
            instead of event listener lists.
         https://bugs.webkit.org/show_bug.cgi?id=29825
@@ -8196 +8220 @@
         alive due to the change above.
         (WebCore::NamedNodeMap::addAttribute): Fix function name in comment.
-        (WebCore::NamedNodeMap::removeAttribute): Removed unneeded "+ 1" and added
+        (WebCore::NamedNodeMap::removeAttribute): Removed unneeded "1" and added
         missing braces.
 
@@ -8319 +8343 @@
         a solid background color the new paragraph did not have the element with the solid color in the tree.
         2. in some circumstances it generated more markup than the original paragraph had (a span with bold, italic,
-        background color and some font attribute was being reproduced as span + bold + italic + font as separate tags.
+        background color and some font attribute was being reproduced as span bold italic font as separate tags.
         The new approach is to recreate in the new paragraph the same hierarchy of nodes found in the
         paragraph where the insertion point is.
@@ -8655 +8679 @@
         Reviewed by Oliver Hunt.
 
-        Implement correct horizontal scrollbar behavior for GTK+ also on
+        Implement correct horizontal scrollbar behavior for GTKalso on
         styled scrollbars.
 
@@ -10529 +10553 @@
 2009-09-19  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
-        Unreviewed build fix for GTK+ and a blind one for Qt after r48566.
+        Unreviewed build fix for GTKand a blind one for Qt after r48566.
 
         * GNUmakefile.am:
@@ -11283 +11307 @@
 
         <rdar://problem/7007541> 
-        CrashTracer: 4800+ crashes in Safari at com.apple.WebKit • WTF::HashTableIterator...
+        CrashTracer: 4800crashes in Safari at com.apple.WebKit • WTF::HashTableIterator...
         
         Make RuntimeObjectImp more robust against m_instance being a null (which can happen if an OOP plug-in
@@ -12565 +12589 @@
         Reviewed by Dan Bernstein.
 
-        <rdar://problem/7047282> Safari crashes at WebCore::RenderMenuList::adjustInnerStyle() + 436
+        <rdar://problem/7047282> Safari crashes at WebCore::RenderMenuList::adjustInnerStyle() 436
         
         Avoid a crash when a mouse event handler on a <select> changes the select from a popup
@@ -13581 +13605 @@
         Reviewed by Gustavo Noronha.
 
-        Build fix for GTK+ after r48267.
+        Build fix for GTKafter r48267.
 
         * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
@@ -14622 +14646 @@
 2009-09-08  Xan Lopez  <xlopez@igalia.com>
 
-        Unreviewed attempt to fix the GTK+ build.
+        Unreviewed attempt to fix the GTKbuild.
 
         * GNUmakefile.am:
@@ -20288 +20312 @@
         * platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:
         * platform/graphics/gtk/VideoSinkGStreamer.cpp:
-        (webkit_video_sink_idle_func): Use C++ casts, decrease reference count of async
+        (webkit_video_sink_idle_func): Use C+casts, decrease reference count of async
         queue at the end of the idle function.
         (webkit_video_sink_render): Increase reference count of async queue.
@@ -22049 +22073 @@
         Reviewed by Eric Seidel.
 
-        Add 'icu::' qualifier when refering to ICU C++ names to the other
+        Add 'icu::' qualifier when refering to ICU C+names to the other
         file with this issue missed in the previous check-in.
 
@@ -22332 +22356 @@
         Reviewed by Eric Seidel
 
-        Add 'icu::' qualifier when refering to ICU C++ names.
+        Add 'icu::' qualifier when refering to ICU C+names.
 
         https://bugs.webkit.org/show_bug.cgi?id=28410
@@ -26510 +26534 @@
 
         <rdar://problem/6952336>
-        CrashTracer: [USER] 3 crashes in Safari at com.apple.WebCore • WebCore::SecurityOrigin::canAccess const + 27
+        CrashTracer: [USER] 3 crashes in Safari at com.apple.WebCore • WebCore::SecurityOrigin::canAccess const 27
 
         Make sure to set the security origin before calling dispatchWindowObjectAvailable.
@@ -26834 +26858 @@
 
         https://bugs.webkit.org/show_bug.cgi?id=28204
-        Allow C++ exceptions to be disabled in WebCore's V8 Mac build.
+        Allow C+exceptions to be disabled in WebCore's V8 Mac build.
 
         * WebCorePrefix.h:
         Only undefine |try| and |catch| when building Objective-C[++],
-        leaving the C++ library definitions intact for C++.
+        leaving the C+library definitions intact for C++.
 
 2009-08-12  Nate Chapin  <japhet@chromium.org>
@@ -27888 +27912 @@
         Reviewed by Darin Fisher.
 
-        Cleanup DOM Storage namespace shutdown code + usage of security origin.
+        Cleanup DOM Storage namespace shutdown code usage of security origin.
         https://bugs.webkit.org/show_bug.cgi?id=28094
 
@@ -27995 +28019 @@
 2009-08-10  Xan Lopez  <xlopez@igalia.com>
 
-        Fix GTK+ build.
+        Fix GTKbuild.
 
         * platform/network/soup/ResourceHandleSoup.cpp:
@@ -28009 +28033 @@
         * platform/graphics/wince/GraphicsContextWince.cpp:
         (WebCore::GraphicsContext::drawText): Changed to use advances(from)
-            instead of advanceData() + from.
+            instead of advanceData() from.
 
 2009-08-10  Xan Lopez  <xlopez@igalia.com>
@@ -28322 +28346 @@
         Modify FrameLoadType enum to match the order of WebFrameLoadType in WebFramePrivate.h / IWebFramePrivate.idl.
         The mac/win public API exposes the old 'FrameLoadTypeReloadAllowingStaleData' value, which resides between
-        'FrameLoadTypeReload' and 'FrameLoadTypeSame'. Work around this problem, by assigning 'FrameLoadTypeSame = FrameLoadTypeReload + 2'.
+        'FrameLoadTypeReload' and 'FrameLoadTypeSame'. Work around this problem, by assigning 'FrameLoadTypeSame = FrameLoadTypeReload 2'.
 
         Add a note to the FrameLoadType enum to keep it in sync with WebFramePrivate.h & IWebFramePrivate.idl.
@@ -35632 +35656 @@
         I decided to change these to Base:: instead of DOMObjectWithGlobal::
         for future-proofing.  All autogenerated classes use a typedef Base
-        to avoid bugs like these.  Sadly C++ does not have a built-in super:: we could use.
+        to avoid bugs like these.  Sadly C+does not have a built-in super:: we could use.
 
         * WebCore.xcodeproj/project.pbxproj:
@@ -36500 +36524 @@
 2009-07-22  Xan Lopez  <xlopez@igalia.com>
 
-        Attempt to fix the GTK+ build.
+        Attempt to fix the GTKbuild.
 
         * GNUmakefile.am:
@@ -42561 +42585 @@
         Crash in RenderMedia::styleDidChange.
         <rdar://problem/7044313> CrashTracer: quicklook crashed generating thumbnail for page with 
-        media element (RenderMedia::styleDidChange + 115)
+        media element (RenderMedia::styleDidChange 115)
 
         Speculative fix for crash in styleDidChange. Null check controller elements before tell
@@ -43679 +43703 @@
         Not reviewed, Chromium build fix.
 
-        Add in missing header + fix syntax issue that crept into last patch.
+        Add in missing header fix syntax issue that crept into last patch.
         https://bugs.webkit.org/show_bug.cgi?id=27027
 
@@ -44510 +44534 @@
         Report the caret offset from the end of the selection, otherwise
         we'll report the same offset when moving the caret while
-        modififying the selection (eg, with Shift + Right).
+        modififying the selection (eg, with Shift Right).
 
         * editing/gtk/SelectionControllerGtk.cpp:
@@ -45779 +45803 @@
         Reviewed by Geoff Garen.
 
-        <rdar://problem/6960286> CrashTracer: [REGRESSION] 1120 crashes in Safari at com.apple.WebCore WebCore::JSLazyEventListener::parseCode const + 62
+        <rdar://problem/6960286> CrashTracer: [REGRESSION] 1120 crashes in Safari at com.apple.WebCore WebCore::JSLazyEventListener::parseCode const 62
 
         <select> elements and other elements the produce popups can keep their popups
@@ -46435 +46459 @@
         Reviewed by Jan Alonzo.
 
-        [GTK] Don't use deprecated GTK+ symbols.
+        [GTK] Don't use deprecated GTKsymbols.
         https://bugs.webkit.org/show_bug.cgi?id=26583
 
@@ -51928 +51952 @@
         Reviewed by Brady Eidson.
 
-        <rdar://problem/6660037> CrashTracer: [USER] 46 crashes in Safari at com.apple.WebCore • WebCore::CachedCSSStyleSheet::addClient + 53
+        <rdar://problem/6660037> CrashTracer: [USER] 46 crashes in Safari at com.apple.WebCore • WebCore::CachedCSSStyleSheet::addClient 53
         
         When revalidating a resource, calling addClient() on one client might cause another to get removed.
@@ -51990 +52014 @@
         Provide an assignment operator to avoid improper reference
         counts on the Cairo font objects.  This brings the Windows
-        Cairo port in line with the GTK+ port.
+        Cairo port in line with the GTKport.
 
         * platform/graphics/win/FontPlatformData.h:

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -907 +907 @@
                 // On the other hand, since font-size doesn't include the zoom factor, we really can't do
                 // that here either.
-                return CSSPrimitiveValue::create(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, CSSPrimitiveValue::CSS_PX);
+                // The line height returned is rounded to the nearest integer.
+                return CSSPrimitiveValue::create(length.calcMinValue(style->fontDescription().specifiedSize(), true), CSSPrimitiveValue::CSS_PX);
             return CSSPrimitiveValue::create(length.value(), CSSPrimitiveValue::CSS_PX);
         }

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -430 +430 @@
                 lineHeight = baseline + baselineToBottom;
             } else if (parentLineHeight.isPercent()) {
-                lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize());
+                lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize(), true);
                 baseline = 0;
                 for (size_t i = 0; i < usedFonts.size(); ++i) {

trunk/WebCore/rendering/RenderBR.cpp

@@ -65 +65 @@
         }
         if (lh.isPercent())
-            return lh.calcMinValue(s->fontSize());
+            return lh.calcMinValue(s->fontSize(), true);
         return lh.value();
     }

trunk/WebCore/rendering/style/RenderStyle.h

@@ -459 +459 @@
 
         if (lh.isPercent())
-            return lh.calcMinValue(fontSize());
+            return lh.calcMinValue(fontSize(), true);
 
         return lh.value();