[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:58:22 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit afcc7a9b9dc832480576b59bcfd9628f054ef4ea
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 29 21:10:59 2003 +0000
Forgot to commit expected.txt for new whitespace test.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5078 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/fast/text/whitespace/024-expected.txt b/LayoutTests/fast/text/whitespace/024-expected.txt
new file mode 100644
index 0000000..acba928
--- /dev/null
+++ b/LayoutTests/fast/text/whitespace/024-expected.txt
@@ -0,0 +1,149 @@
+layer at (0,0) size 800x1177
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x1177
+ RenderBlock {HTML} at (0,0) size 800x1177
+ RenderBody {BODY} at (8,8) size 784x1161 [bgcolor=#FFFFFF]
+ RenderBlock {H1} at (0,0) size 784x33 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 355x33
+ text run at (0,0) width 355: "Safari 1.0 PRE width bug"
+ RenderBlock (anonymous) at (0,51) size 784x68 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 107x17 [bgcolor=#FFFFFF]
+ text run at (0,0) width 107: "As noted in my "
+ RenderInline {A} at (0,0) size 31x17 [color=#0000EE]
+ RenderText {TEXT} at (107,0) size 31x17
+ text run at (107,0) width 31: "blog"
+ RenderText {TEXT} at (138,0) size 771x68 [bgcolor=#FFFFFF]
+ text run at (138,0) width 9: ", "
+ text run at (147,0) width 457: "in certain cases Safari will miscalculate the width of a PRE element. "
+ text run at (604,0) width 141: "I think I've found the"
+ text run at (0,17) width 362: "trigger. If a nested container element is preceded by "
+ text run at (362,17) width 409: "uncontained text and a blank line, and there are \"too many\""
+ text run at (0,34) width 75: "characters "
+ text run at (75,34) width 441: "contained in the nested element, the PRE width will be too wide. "
+ text run at (516,34) width 234: "In the examples below, the nested"
+ text run at (0,51) width 231: "element is a SPAN whose content "
+ text run at (231,51) width 249: "is the days-of-week line, as follows:"
+ RenderBlock {PRE} at (0,133) size 784x16 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 376x16
+ text run at (0,0) width 376: " <SPAN CLASS=dow> D M T W J F S</SPAN>"
+ RenderBlock {H2} at (0,166) size 784x24 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 112x24
+ text run at (0,0) width 112: "Example 1"
+ RenderTable {TABLE} at (0,207) size 784x182 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (0,0) size 0x182
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 178x178 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {PRE} at (1,1) size 176x176 [bgcolor=#CCCC99]
+ RenderText {TEXT} at (8,8) size 96x16
+ text run at (8,8) width 96: " 2003"
+ RenderInline {SPAN} at (0,0) size 160x19 [bgcolor=#000000]
+ RenderText {TEXT} at (8,40) size 160x16
+ text run at (8,40) width 160: " D M T W J F S"
+ RenderText {TEXT} at (8,72) size 160x96
+ text run at (8,72) width 120: " September"
+ text run at (8,88) width 160: " 1 2 3 4 5 6"
+ text run at (8,104) width 160: " 7 8 9 10 11 12 13"
+ text run at (8,120) width 160: "14 15 16 17 18 19 20"
+ text run at (8,136) width 160: "21 22 23 24 25 26 27"
+ text run at (8,152) width 64: "28 29 30"
+ RenderTableCell {TD} at (182,2) size 600x19 [r=0 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 531x17
+ text run at (1,1) width 373: "The blank line between '2003' and the nested element "
+ text run at (374,1) width 158: "triggers the width bug."
+ RenderBlock (anonymous) at (0,389) size 784x17 [bgcolor=#000000]
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#FFFFFF]
+ RenderBlock {H2} at (0,423) size 784x24 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 112x24
+ text run at (0,0) width 112: "Example 2"
+ RenderTable {TABLE} at (0,464) size 784x182 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (0,0) size 0x182
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 178x178 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {PRE} at (1,1) size 176x176 [bgcolor=#CCCC99]
+ RenderText {TEXT} at (8,8) size 96x16
+ text run at (8,8) width 96: " 2003"
+ RenderInline {SPAN} at (0,0) size 96x19 [bgcolor=#000000]
+ RenderText {TEXT} at (8,40) size 96x16
+ text run at (8,40) width 96: " D M TWJFS"
+ RenderText {TEXT} at (8,72) size 160x96
+ text run at (8,72) width 120: " September"
+ text run at (8,88) width 160: " 1 2 3 4 5 6"
+ text run at (8,104) width 160: " 7 8 9 10 11 12 13"
+ text run at (8,120) width 160: "14 15 16 17 18 19 20"
+ text run at (8,136) width 160: "21 22 23 24 25 26 27"
+ text run at (8,152) width 64: "28 29 30"
+ RenderTableCell {TD} at (182,2) size 600x67 [r=0 c=1 rs=1 cs=1]
+ RenderBlock (anonymous) at (1,1) size 598x17
+ RenderText {TEXT} at (0,0) size 531x17
+ text run at (0,0) width 373: "The blank line between '2003' and the nested element "
+ text run at (373,0) width 158: "triggers the width bug."
+ RenderBlock {P} at (1,32) size 598x34
+ RenderText {TEXT} at (0,0) size 529x34
+ text run at (0,0) width 383: "Here, the excess whitespace is reduced by reducing the "
+ text run at (383,0) width 146: "number of characters"
+ text run at (0,17) width 228: "contained by the nested element."
+ RenderBlock (anonymous) at (0,646) size 784x17 [bgcolor=#000000]
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#FFFFFF]
+ RenderBlock {H2} at (0,680) size 784x24 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 112x24
+ text run at (0,0) width 112: "Example 3"
+ RenderTable {TABLE} at (0,721) size 784x166 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (0,0) size 0x166
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 178x162 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {PRE} at (1,1) size 176x160 [bgcolor=#CCCC99]
+ RenderText {TEXT} at (8,8) size 96x16
+ text run at (8,8) width 96: " 2003"
+ RenderInline {SPAN} at (0,0) size 160x19 [bgcolor=#000000]
+ RenderText {TEXT} at (8,24) size 160x16
+ text run at (8,24) width 160: " D M T W J F S"
+ RenderText {TEXT} at (8,56) size 160x96
+ text run at (8,56) width 120: " September"
+ text run at (8,72) width 160: " 1 2 3 4 5 6"
+ text run at (8,88) width 160: " 7 8 9 10 11 12 13"
+ text run at (8,104) width 160: "14 15 16 17 18 19 20"
+ text run at (8,120) width 160: "21 22 23 24 25 26 27"
+ text run at (8,136) width 64: "28 29 30"
+ RenderTableCell {TD} at (182,2) size 600x36 [r=0 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 597x34
+ text run at (1,1) width 373: "The blank line between '2003' and the nested element "
+ text run at (374,1) width 224: "has been removed, so the bug is"
+ text run at (1,18) width 95: "not triggered."
+ RenderBlock (anonymous) at (0,887) size 784x17 [bgcolor=#000000]
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#FFFFFF]
+ RenderBlock {H2} at (0,921) size 784x24 [bgcolor=#000000]
+ RenderText {TEXT} at (0,0) size 112x24
+ text run at (0,0) width 112: "Example 4"
+ RenderTable {TABLE} at (0,962) size 784x182 [bgcolor=#000000]
+ RenderTableSection {TBODY} at (0,0) size 0x182
+ RenderTableRow {TR} at (0,0) size 0x0
+ RenderTableCell {TD} at (2,2) size 178x178 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {PRE} at (1,1) size 176x176 [bgcolor=#CCCC99]
+ RenderInline {SPAN} at (0,0) size 96x16 [bgcolor=#000000]
+ RenderText {TEXT} at (8,8) size 96x16
+ text run at (8,8) width 96: " 2003"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderInline {SPAN} at (0,0) size 160x19 [bgcolor=#000000]
+ RenderText {TEXT} at (8,40) size 160x16
+ text run at (8,40) width 160: " D M T W J F S"
+ RenderText {TEXT} at (8,72) size 160x96
+ text run at (8,72) width 120: " September"
+ text run at (8,88) width 160: " 1 2 3 4 5 6"
+ text run at (8,104) width 160: " 7 8 9 10 11 12 13"
+ text run at (8,120) width 160: "14 15 16 17 18 19 20"
+ text run at (8,136) width 160: "21 22 23 24 25 26 27"
+ text run at (8,152) width 64: "28 29 30"
+ RenderTableCell {TD} at (182,2) size 600x53 [r=0 c=1 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 565x51
+ text run at (1,1) width 373: "The blank line between '2003' and the nested element "
+ text run at (374,1) width 192: "no longer triggers the width"
+ text run at (1,18) width 347: "bug, because now the '2003' is itself contained by "
+ text run at (348,18) width 208: "a nested element (in this case,"
+ text run at (1,35) width 102: "another SPAN)."
+ RenderBlock (anonymous) at (0,1144) size 784x17 [bgcolor=#000000]
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#FFFFFF]
+ RenderText {TEXT} at (0,0) size 0x0 [bgcolor=#FFFFFF]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list