[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mitz at apple.com
mitz at apple.com
Thu Apr 8 01:14:08 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0ff0fd180d4d19860d9617c517fd0ff902d06d13
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 19 02:59:21 2010 +0000
Rubber-stamped by Sam Weinig.
<rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change
WebCore:
Reverted r49567.
* 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):
LayoutTests:
Reverted r49567, but left in the test added in that revision, now with a failing result.
* css1/font_properties/font.html:
* fast/css/line-height-rounding-expected.txt:
* 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.txt:
* platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
* platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53450 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9add9fa..6c8103e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-01-18 Dan Bernstein <mitz at apple.com>
+
+ Rubber-stamped by Sam Weinig.
+
+ <rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change
+
+ Reverted r49567, but left in the test added in that revision, now with a failing result.
+
+ * css1/font_properties/font.html:
+ * fast/css/line-height-rounding-expected.txt:
+ * 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.txt:
+ * platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
+ * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
+
2010-01-18 Yuzo Fujishima <yuzo at google.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/css1/font_properties/font.html b/LayoutTests/css1/font_properties/font.html
index 8760771..596b57a 100644
--- a/LayoutTests/css1/font_properties/font.html
+++ b/LayoutTests/css1/font_properties/font.html
@@ -68,7 +68,7 @@ This element should be in a sans-serif font, italicized and small caps, with a w
This element should be in a sans-serif font, oblique and not small-caps, with a weight of 700. Its font-size should be 18 pixels, and its line-height should be 36px (200% this element's font size). Extra text is included for the purposes of testing this more effectively.
</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 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.
+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.
</P>
<P class="six">
@@ -114,7 +114,7 @@ This element should be in a sans-serif font, italicized and small caps, with a w
This element should be in a sans-serif font, oblique and not small-caps, with a weight of 700. Its font-size should be 18 pixels, and its line-height should be 36px (200% this element's font size). Extra text is included for the purposes of testing this more effectively.
</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 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.
+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.
</P>
<P class="six">
diff --git a/LayoutTests/fast/css/line-height-rounding-expected.txt b/LayoutTests/fast/css/line-height-rounding-expected.txt
index 59e9f6a..a2f7a02 100644
--- a/LayoutTests/fast/css/line-height-rounding-expected.txt
+++ b/LayoutTests/fast/css/line-height-rounding-expected.txt
@@ -1,3 +1,5 @@
This tests non-integer line height is rounded to the nearest integer.
-Test passed.
+Test failed:
+FAIL: font size: 10px; line height percent: 1.05; expected line height: 11px; actual line height: 10px
+
diff --git a/LayoutTests/platform/mac/css1/font_properties/font-expected.txt b/LayoutTests/platform/mac/css1/font_properties/font-expected.txt
index 1518a7c..d665990 100644
--- a/LayoutTests/platform/mac/css1/font_properties/font-expected.txt
+++ b/LayoutTests/platform/mac/css1/font_properties/font-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x4268
+layer at (0,0) size 785x4266
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x4268
- RenderBlock {HTML} at (0,0) size 785x4268
- RenderBody {BODY} at (8,8) size 769x4252 [bgcolor=#CCCCCC]
+layer at (0,0) size 785x4266
+ RenderBlock {HTML} at (0,0) size 785x4266
+ RenderBody {BODY} at (8,8) size 769x4250 [bgcolor=#CCCCCC]
RenderBlock {P} at (0,0) size 769x14
RenderText {#text} at (0,0) size 264x14
text run at (0,0) width 264: "The style declarations which apply to the text below are:"
@@ -106,9 +106,9 @@ layer at (0,0) size 785x4268
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 (0,1519) size 769x50
- RenderText {#text} at (0,6) size 751x37
+ RenderText {#text} at (0,6) size 754x37
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 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 (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 (0,31) width 318: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1587) size 769x216
RenderInline {SPAN} at (0,0) size 765x183 [bgcolor=#C0C0C0]
@@ -119,18 +119,18 @@ layer at (0,0) size 785x4268
text run at (0,124) width 750: "54px, respectively). The text should have a silver background. The background color has been set"
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 769x2431 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 767x2429
+ RenderTable {TABLE} at (0,1821) size 769x2429 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 767x2427
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 163x18
RenderText {#text} at (4,4) size 163x18
text run at (4,4) width 163: "TABLE Testing Section"
- 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]
+ 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]
RenderText {#text} at (4,4) size 4x18
text run at (4,4) width 4: " "
- RenderTableCell {TD} at (12,26) size 755x2403 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (12,26) size 755x2401 [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
text run at (0,0) width 564: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. "
@@ -208,13 +208,13 @@ layer at (0,0) size 785x4268
text run at (0,79) width 176: "element's font size). "
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 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
+ 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
RenderInline {SPAN} at (0,0) size 716x388 [bgcolor=#C0C0C0]
RenderText {#text} at (0,22) size 716x388
text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps,"
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt
index 65faaa7..5317641 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x501
- RenderBlock {HTML} at (0,0) size 800x501
- RenderBody {BODY} at (8,16) size 784x469
+layer at (0,0) size 800x484
+ RenderBlock {HTML} at (0,0) size 800x484
+ RenderBody {BODY} at (8,16) size 784x452
RenderBlock {P} at (0,0) size 784x54 [color=#000080]
RenderText {#text} at (0,0) size 778x54
text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
@@ -12,7 +12,7 @@ layer at (0,0) size 800x501
text run at (486,18) width 292: "in which case the big box should be level with"
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 752x399 [color=#C0C0C0] [border: (5px solid #800080)]
+ RenderBlock {DIV} at (16,70) size 752x382 [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 "
RenderInline {SPAN} at (0,0) size 18x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
@@ -20,52 +20,52 @@ layer at (0,0) size 800x501
text run at (648,22) width 12: "A"
RenderText {#text} at (663,22) size 4x18
text run at (663,22) width 4: " "
- RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+ RenderBlock (floating) {P} at (21,21) size 150x58 [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 544x39
+ RenderText {#text} at (667,22) size 544x38
text run at (667,22) width 48: "dummy"
- text run at (171,43) width 422: "text dummy text dummy text dummy text dummy text dummy text "
+ text run at (171,42) 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,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 (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 (19,20) size 44x18
text run at (19,20) width 44: "BBBB"
- 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"
+ 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"
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
index 5cf6235..d5844e3 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x503
- RenderBlock {HTML} at (0,0) size 800x503
- RenderBody {BODY} at (8,16) size 784x471
+layer at (0,0) size 800x484
+ RenderBlock {HTML} at (0,0) size 800x484
+ RenderBody {BODY} at (8,16) size 784x452
RenderBlock {P} at (0,0) size 784x54 [color=#000080]
RenderText {#text} at (0,0) size 769x54
text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
@@ -12,56 +12,56 @@ layer at (0,0) size 800x503
text run at (479,18) width 290: "big box should be level with the bottom of the"
text run at (0,36) width 104: "respective small "
text run at (104,36) width 33: "box)."
- 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 "
+ 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 "
RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
- 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: " "
+ 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: " "
RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000]
- 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 "
+ 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 "
RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
- 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"
+ 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"
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt
index 486dffb..f920f59 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x564
- RenderBlock {HTML} at (0,0) size 800x564
- RenderBody {BODY} at (8,16) size 784x532
+layer at (0,0) size 800x544
+ RenderBlock {HTML} at (0,0) size 800x544
+ RenderBody {BODY} at (8,16) size 784x512
RenderBlock {P} at (0,0) size 784x54 [color=#000080]
RenderText {#text} at (0,0) size 778x54
text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
@@ -12,7 +12,7 @@ layer at (0,0) size 800x564
text run at (486,18) width 292: "in which case the big box should be as high as"
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 752x462 [color=#C0C0C0] [border: (5px solid #800080)]
+ RenderBlock {DIV} at (16,70) size 752x442 [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 "
text run at (495,22) width 79: "dummy text "
@@ -21,63 +21,63 @@ layer at (0,0) size 800x564
text run at (577,22) width 12: "A"
RenderText {#text} at (592,22) size 4x18
text run at (592,22) width 4: " "
- RenderBlock (floating) {P} at (21,42) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+ RenderBlock (floating) {P} at (21,41) size 150x58 [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 552x39
+ RenderText {#text} at (596,22) size 552x38
text run at (596,22) width 127: "dummy text dummy"
- text run at (171,43) width 343: "text dummy text dummy text dummy text dummy text "
+ text run at (171,42) 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,43) size 11x18
- text run at (517,43) width 11: "B"
+ RenderText {#text} at (517,42) size 11x18
+ text run at (517,42) width 11: "B"
RenderText {#text} at (0,0) size 0x0
- RenderBlock (floating) {P} at (581,42) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+ RenderBlock (floating) {P} at (581,41) size 150x58 [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,64) size 237x18
- text run at (321,64) width 237: "dummy text dummy text dummy text "
+ RenderText {#text} at (321,62) size 237x18
+ text run at (321,62) 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,64) size 11x18
- text run at (561,64) width 11: "C"
+ RenderText {#text} at (561,62) size 11x18
+ text run at (561,62) width 11: "C"
RenderText {#text} at (0,0) size 0x0
- RenderBlock (floating) {P} at (171,63) size 150x59 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
+ RenderBlock (floating) {P} at (171,61) size 150x58 [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,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 "
+ 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 "
RenderInline {SPAN} at (0,0) size 15x24 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
- RenderText {#text} at (711,106) size 12x18
- text run at (711,106) width 12: "D"
+ RenderText {#text} at (711,102) size 12x18
+ text run at (711,102) width 12: "D"
RenderText {#text} at (0,0) size 0x0
- RenderBlock (floating) {P} at (321,105) size 150x59 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
+ RenderBlock (floating) {P} at (321,101) size 150x58 [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,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"
+ 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"
diff --git a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt
index b113964..6d39b64 100644
--- a/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt
+++ b/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x480
- RenderBlock {HTML} at (0,0) size 800x480
- RenderBody {BODY} at (8,16) size 784x448
+layer at (0,0) size 800x464
+ RenderBlock {HTML} at (0,0) size 800x464
+ RenderBody {BODY} at (8,16) size 784x432
RenderBlock {P} at (0,0) size 784x54 [color=#000080]
RenderText {#text} at (0,0) size 778x54
text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small "
@@ -12,7 +12,7 @@ layer at (0,0) size 800x480
text run at (486,18) width 292: "in which case the big box should be as high as"
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 752x378 [color=#C0C0C0] [border: (5px solid #800080)]
+ RenderBlock {DIV} at (16,70) size 752x362 [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 "
RenderInline {SPAN} at (0,0) size 18x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
@@ -20,7 +20,7 @@ layer at (0,0) size 800x480
text run at (490,22) width 12: "A"
RenderText {#text} at (505,22) size 4x18
text run at (505,22) width 4: " "
- RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+ RenderBlock (floating) {P} at (21,21) size 150x58 [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 (0,0) size 0x0
@@ -29,42 +29,42 @@ layer at (0,0) size 800x480
text run at (512,22) width 11: "B"
RenderText {#text} at (526,22) size 4x18
text run at (526,22) width 4: " "
- RenderBlock (floating) {P} at (581,21) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+ RenderBlock (floating) {P} at (581,21) size 150x58 [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 707x333
+ RenderText {#text} at (530,22) size 707x318
text run at (530,22) width 48: "dummy"
- 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"
+ 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"
diff --git a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum
index 64ca267..00d6504 100644
--- a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum
@@ -1 +1 @@
-53f3eb75f9a6563791fa4d8613d7f46c
\ No newline at end of file
+02d6337b033863d06052de3b78597d86
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 5b3cd21..bfeeaf9 100644
--- a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -1,10 +1,10 @@
-layer at (0,0) size 1026x1035
+layer at (0,0) size 1026x1014
RenderView at (0,0) size 785x585
-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
+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
RenderInline {A} at (0,0) size 90x18 [color=#0000EE]
RenderText {#text} at (267,1) size 90x18
text run at (267,1) width 90: "Full version"
@@ -13,13 +13,13 @@ layer at (0,0) size 1026x1035
RenderInline {A} at (0,0) size 102x18 [color=#0000EE]
RenderText {#text} at (368,1) size 102x18
text run at (368,1) width 102: "Basic version"
- RenderBlock {P} at (0,21) size 737x21
+ RenderBlock {P} at (0,20) size 737x20
RenderText {#text} at (182,1) size 143x18
text run at (182,1) width 143: "Specification link: "
RenderInline {A} at (0,0) size 230x18 [color=#0000EE]
RenderText {#text} at (325,1) size 230x18
text run at (325,1) width 230: "3.4 How groups are rendered"
- RenderBlock {P} at (0,42) size 737x21
+ RenderBlock {P} at (0,40) size 737x20
RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
RenderText {#text} at (148,1) size 206x18
text run at (148,1) width 206: "pservers-pattern-01-b \x{2190}"
@@ -34,26 +34,26 @@ layer at (0,0) size 1026x1035
RenderText {#text} at (408,1) size 180x18
text run at (408,1) width 180: "\x{2192} script-handle-01-b"
RenderText {#text} at (0,0) size 0x0
- 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
+ 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
RenderTableRow {TR} at (0,2) size 998x106
RenderTableCell {TD} at (2,2) size 994x106 [r=0 c=0 rs=1 cs=2]
RenderBlock {H1} at (8,29) size 978x48
RenderText {#text} at (312,5) size 354x38
text run at (312,5) width 354: "render-groups-01-b"
- 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]
+ 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]
RenderText {#text} at (203,9) size 89x18
text run at (203,9) width 89: "SVG Image"
- RenderTableCell {TD} at (500,110) size 496x37 [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (500,110) size 496x36 [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,149) size 998x381
- RenderTableCell {TD} at (2,149) size 496x381 [r=2 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,148) size 998x380
+ RenderTableCell {TD} at (2,148) size 496x380 [r=2 c=0 rs=1 cs=1]
RenderEmbeddedObject {EMBED} at (8,8) size 480x360
layer at (0,0) size 480x360
RenderView at (0,0) size 480x360
@@ -83,46 +83,46 @@ layer at (0,0) size 1026x1035
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.6 $"
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,149) size 496x381 [r=2 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (500,148) size 496x380 [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,630) size 723x348
- RenderBlock {P} at (0,0) size 723x42
- RenderText {#text} at (0,1) size 720x39
+ RenderBlock {DIV} at (23,625) size 723x333
+ RenderBlock {P} at (0,0) size 723x40
+ RenderText {#text} at (0,1) size 720x38
text run at (0,1) width 720: "Verifies implicit rendering order (paragraph 3.3) and grouping mechanism (paragraphs 3.4)."
- 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,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,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,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,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,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,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
+ 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
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,994) size 737x21
- RenderBlock {P} at (0,0) size 737x21
+ RenderBlock {DIV} at (16,974) size 737x20
+ RenderBlock {P} at (0,0) size 737x20
RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
RenderText {#text} at (148,1) size 206x18
text run at (148,1) width 206: "pservers-pattern-01-b \x{2190}"
@@ -137,4 +137,4 @@ layer at (0,0) size 1026x1035
RenderText {#text} at (408,1) size 180x18
text run at (408,1) width 180: "\x{2192} script-handle-01-b"
RenderText {#text} at (0,0) size 0x0
-scrolled to 0,450
+scrolled to 0,429
diff --git a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum
index 1cf80fa..a02975e 100644
--- a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum
@@ -1 +1 @@
-4cf3848efefdd7b4d77a0d1f1b49e079
\ No newline at end of file
+81565beca8cbbefe41ef1bd6a16ee351
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
index 4301701..5836229 100644
--- a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
@@ -19,12 +19,12 @@ layer at (173,32) size 453x453
RenderInline {SPAN} at (0,0) size 0x0
RenderBlock {DIV} at (0,0) size 453x0
RenderInline {SPAN} at (0,0) size 0x0
-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,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,118) size 453x20
RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00]
RenderInline {SPAN} at (0,0) size 149x19
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 69471bc..a7abbc8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-18 Dan Bernstein <mitz at apple.com>
+
+ Rubber-stamped by Sam Weinig.
+
+ <rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change
+
+ Reverted r49567.
+
+ * 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):
+
2010-01-18 Steve Block <steveblock at google.com>
Reviewed by Adam Barth.
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index 24b64d5..8039e35 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -910,8 +910,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
// for how high to be in pixels does include things like minimum font size and the zoom factor.
// On the other hand, since font-size doesn't include the zoom factor, we really can't do
// that here either.
- // 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(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, CSSPrimitiveValue::CSS_PX);
return CSSPrimitiveValue::create(length.value(), CSSPrimitiveValue::CSS_PX);
}
case CSSPropertyListStyleImage:
diff --git a/WebCore/rendering/InlineFlowBox.cpp b/WebCore/rendering/InlineFlowBox.cpp
index b42ea33..34eec30 100644
--- a/WebCore/rendering/InlineFlowBox.cpp
+++ b/WebCore/rendering/InlineFlowBox.cpp
@@ -429,7 +429,7 @@ void InlineFlowBox::computeLogicalBoxHeights(int& maxPositionTop, int& maxPositi
}
lineHeight = baseline + baselineToBottom;
} else if (parentLineHeight.isPercent()) {
- lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize(), true);
+ lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize());
baseline = 0;
for (size_t i = 0; i < usedFonts.size(); ++i) {
int halfLeading = (lineHeight - usedFonts[i]->ascent() - usedFonts[i]->descent()) / 2;
diff --git a/WebCore/rendering/RenderBR.cpp b/WebCore/rendering/RenderBR.cpp
index 012a433..340d6b7 100644
--- a/WebCore/rendering/RenderBR.cpp
+++ b/WebCore/rendering/RenderBR.cpp
@@ -62,7 +62,7 @@ int RenderBR::lineHeight(bool firstLine, bool /*isRootLineBox*/) const
return s->font().lineSpacing();
}
if (lh.isPercent())
- return lh.calcMinValue(s->fontSize(), true);
+ return lh.calcMinValue(s->fontSize());
return lh.value();
}
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index 2682bb3..33cfeb2 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -464,7 +464,7 @@ public:
return font().lineSpacing();
if (lh.isPercent())
- return lh.calcMinValue(fontSize(), true);
+ return lh.calcMinValue(fontSize());
return lh.value();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list