[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:25:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bce82fc511b26ecbdf5ba4740176b648740a2ffb
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 4 21:49:45 2004 +0000
Committed new tests for RenderBR change
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/clear-expected.txt b/LayoutTests/css1/box_properties/clear-expected.txt
index 3ea19b9..d64dac6 100644
--- a/LayoutTests/css1/box_properties/clear-expected.txt
+++ b/LayoutTests/css1/box_properties/clear-expected.txt
@@ -18,21 +18,21 @@ layer at (0,0) size 800x961
RenderText {TEXT} at (18,0) size 595x18
text run at (18,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
RenderBlock (anonymous) at (0,159) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (18,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (0,177) size 15x50
RenderBlock {P} at (0,227) size 784x18
RenderText {TEXT} at (0,0) size 649x18
text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."
RenderBlock (anonymous) at (0,261) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (769,279) size 15x50
RenderBlock {P} at (0,329) size 784x18
RenderText {TEXT} at (0,0) size 658x18
text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it."
RenderBlock (anonymous) at (0,363) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (0,381) size 15x50
RenderImage {IMG} at (769,381) size 15x50
@@ -45,7 +45,7 @@ layer at (0,0) size 800x961
RenderText {TEXT} at (18,0) size 390x18
text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles."
RenderBlock (anonymous) at (0,499) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (18,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderTable {TABLE} at (0,517) size 680x428 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x426
@@ -66,21 +66,21 @@ layer at (0,0) size 800x961
RenderText {TEXT} at (18,0) size 595x18
text run at (18,0) width 595: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
RenderBlock (anonymous) at (4,38) size 658x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (18,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (4,56) size 15x50
RenderBlock {P} at (4,106) size 658x18
RenderText {TEXT} at (0,0) size 649x18
text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."
RenderBlock (anonymous) at (4,140) size 658x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (647,158) size 15x50
RenderBlock {P} at (4,208) size 658x18
RenderText {TEXT} at (0,0) size 658x18
text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it."
RenderBlock (anonymous) at (4,242) size 658x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderImage {IMG} at (4,260) size 15x50
RenderImage {IMG} at (647,260) size 15x50
@@ -93,5 +93,5 @@ layer at (0,0) size 800x961
RenderText {TEXT} at (18,0) size 390x18
text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles."
RenderBlock (anonymous) at (4,378) size 658x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (18,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css1/box_properties/float-expected.txt b/LayoutTests/css1/box_properties/float-expected.txt
index 41f46b9..0dead6d 100644
--- a/LayoutTests/css1/box_properties/float-expected.txt
+++ b/LayoutTests/css1/box_properties/float-expected.txt
@@ -18,7 +18,7 @@ layer at (0,0) size 800x460
text run at (614,0) width 165: "In this case, it is the image"
text run at (15,18) width 212: "which has been floated to the left."
RenderBlock (anonymous) at (0,162) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,192) size 784x2 [border: (1px inset #000000)]
RenderImage {IMG} at (769,206) size 15x50
RenderBlock {P} at (0,210) size 784x36
@@ -47,7 +47,7 @@ layer at (0,0) size 800x460
text run at (614,0) width 123: "In this case, it is the"
text run at (15,18) width 254: "image which has been floated to the left."
RenderBlock (anonymous) at (4,56) size 762x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,86) size 762x2 [border: (1px inset #000000)]
RenderImage {IMG} at (751,100) size 15x50
RenderBlock {P} at (4,104) size 762x36
diff --git a/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt b/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
index 2f4078b..7121523 100644
--- a/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
+++ b/LayoutTests/css1/box_properties/float_on_text_elements-expected.txt
@@ -16,7 +16,7 @@ layer at (0,0) size 800x2822
text run at (0,36) width 784: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no padding,"
text run at (0,54) width 740: "border or margins on this and the previous element, so the text of the two elements should be very close to each other."
RenderBlock (anonymous) at (0,72) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,102) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {P} at (0,116) size 784x72 [bgcolor=#FFFF00]
RenderText {TEXT} at (0,0) size 784x72
@@ -69,7 +69,7 @@ layer at (0,0) size 800x2822
text run at (529,18) width 255: "The top of the big letter \"T\" should be"
text run at (48,36) width 656: "vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"."
RenderBlock (anonymous) at (0,555) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,585) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {P} at (438,609) size 336x196 [bgcolor=#FFFF00] [border: (3px solid #FF0000)]
RenderText {TEXT} at (8,8) size 320x180
@@ -105,7 +105,7 @@ layer at (0,0) size 800x2822
text run at (0,162) width 428: "the right of the sidebar's red border, due to the margin styles set for"
text run at (0,180) width 123: "the floated element."
RenderBlock (anonymous) at (0,797) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,827) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,841) size 784x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)]
RenderBlock (floating) {DIV} at (440,14) size 330x226 [bgcolor=#FFFF00]
@@ -132,7 +132,7 @@ layer at (0,0) size 800x2822
RenderText {TEXT} at (0,0) size 268x18
text run at (0,0) width 268: "See description in the box on the right side"
RenderBlock (anonymous) at (0,867) size 784x224
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (0,1103) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (0,1117) size 196x72 [bgcolor=#66CCFF]
RenderBlock {P} at (0,0) size 196x72
@@ -153,7 +153,7 @@ layer at (0,0) size 800x2822
text run at (196,0) width 392: "This paragraph should appear between a blue box (on the left)"
text run at (196,18) width 199: "and a yellow box (on the right)."
RenderBlock (anonymous) at (0,1153) size 784x36
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (196,0) size 0x18
RenderBlock {HR} at (0,1201) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (0,1215) size 588x126 [bgcolor=#66CCFF]
RenderBlock (floating) {DIV} at (431,0) size 147x36 [bgcolor=#FFFF00]
@@ -180,7 +180,7 @@ layer at (0,0) size 800x2822
text run at (539,90) width 49: "px blue"
text run at (0,108) width 138: "stripe on its right side."
RenderBlock (anonymous) at (0,1215) size 784x126
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (588,0) size 0x18
RenderBlock {HR} at (0,1353) size 784x2 [border: (1px inset #000000)]
RenderTable {TABLE} at (0,1367) size 784x1439 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x1437
@@ -208,7 +208,7 @@ layer at (0,0) size 800x2822
text run at (0,54) width 762: "padding, border or margins on this and the previous element, so the text of the two elements should be very close to each"
text run at (0,72) width 36: "other."
RenderBlock (anonymous) at (4,94) size 762x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,124) size 762x2 [border: (1px inset #000000)]
RenderBlock (floating) {P} at (4,138) size 762x72 [bgcolor=#FFFF00]
RenderText {TEXT} at (0,0) size 762x72
@@ -261,7 +261,7 @@ layer at (0,0) size 800x2822
text run at (538,18) width 224: "The top of the big letter \"T\" should"
text run at (48,36) width 675: "be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"."
RenderBlock (anonymous) at (4,577) size 762x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,607) size 762x2 [border: (1px inset #000000)]
RenderBlock (floating) {P} at (420,631) size 336x196 [bgcolor=#FFFF00] [border: (3px solid #FF0000)]
RenderText {TEXT} at (8,8) size 320x180
@@ -298,7 +298,7 @@ layer at (0,0) size 800x2822
text run at (0,180) width 406: "sidebar's red border, due to the margin styles set for the floated"
text run at (0,198) width 53: "element."
RenderBlock (anonymous) at (4,837) size 762x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,867) size 762x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (4,881) size 762x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)]
RenderBlock (floating) {DIV} at (418,14) size 330x226 [bgcolor=#FFFF00]
@@ -325,7 +325,7 @@ layer at (0,0) size 800x2822
RenderText {TEXT} at (0,0) size 268x18
text run at (0,0) width 268: "See description in the box on the right side"
RenderBlock (anonymous) at (4,907) size 762x224
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderBlock {HR} at (4,1143) size 762x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (4,1157) size 190x72 [bgcolor=#66CCFF]
RenderBlock {P} at (0,0) size 190x72
@@ -347,7 +347,7 @@ layer at (0,0) size 800x2822
text run at (190,18) width 29: "left) "
text run at (219,18) width 199: "and a yellow box (on the right)."
RenderBlock (anonymous) at (4,1193) size 762x36
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (190,0) size 0x18
RenderBlock {HR} at (4,1241) size 762x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (4,1255) size 571x126 [bgcolor=#66CCFF]
RenderBlock (floating) {DIV} at (419,0) size 142x36 [bgcolor=#FFFF00]
@@ -374,5 +374,5 @@ layer at (0,0) size 800x2822
text run at (27,108) width 51: "px blue "
text run at (78,108) width 138: "stripe on its right side."
RenderBlock (anonymous) at (4,1255) size 762x126
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (571,0) size 0x18
RenderBlock {HR} at (4,1393) size 762x2 [border: (1px inset #000000)]
diff --git a/LayoutTests/fast/block/float/015-expected.txt b/LayoutTests/fast/block/float/015-expected.txt
index 625248c..a37619d 100644
--- a/LayoutTests/fast/block/float/015-expected.txt
+++ b/LayoutTests/fast/block/float/015-expected.txt
@@ -18,7 +18,7 @@ layer at (0,0) size 800x164
text run at (105,0) width 535: "This text should be flowing past a tall orange rectangle on the left side of the browser"
text run at (105,18) width 56: "window."
RenderBlock {DIV} at (4,56) size 649x18 [bgcolor=#008000]
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderImage {IMG} at (4,74) size 102x50 [bgcolor=#FFA500]
RenderBlock {DIV} at (4,124) size 649x18
RenderText {TEXT} at (0,0) size 649x18
diff --git a/LayoutTests/fast/block/float/021-expected.txt b/LayoutTests/fast/block/float/021-expected.txt
index 0675d5e..51fd93a 100644
--- a/LayoutTests/fast/block/float/021-expected.txt
+++ b/LayoutTests/fast/block/float/021-expected.txt
@@ -30,7 +30,7 @@ layer at (0,0) size 1518x3166
RenderBlock (floating) {DIV} at (10,10) size 1500x100 [bgcolor=#0000FF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {DIV} at (10,110) size 1500x100 [bgcolor=#008000]
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (1510,10) size 0x18
RenderText {TEXT} at (10,210) size 308x18
text run at (10,210) width 308: "You should see blue and green rectangles above."
RenderBlock {DIV} at (0,820) size 720x240 [border: (10px solid #000000)]
@@ -76,7 +76,7 @@ layer at (0,0) size 1518x3166
RenderBlock (floating) {DIV} at (10,10) size 698x100 [bgcolor=#0000FF]
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (floating) {DIV} at (10,110) size 698x100 [bgcolor=#008000]
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (708,10) size 0x18
RenderText {TEXT} at (10,210) size 308x18
text run at (10,210) width 308: "You should see blue and green rectangles above."
RenderBlock {DIV} at (0,2390) size 720x240 [border: (10px solid #000000)]
diff --git a/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt b/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
index ccc2bc8..022b492 100644
--- a/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
+++ b/LayoutTests/fast/encoding/utf-16-big-endian-expected.txt
@@ -197,7 +197,7 @@ layer at (0,0) size 800x1264
RenderText {TEXT} at (2,2) size 4x18
text run at (2,2) width 4: " "
RenderBlock (anonymous) at (1,173) size 604x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x17
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (0,659) size 784x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -290,7 +290,7 @@ layer at (0,0) size 800x1264
RenderText {TEXT} at (2,2) size 4x18
text run at (2,2) width 4: " "
RenderBlock (anonymous) at (1,173) size 493x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x17
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (0,881) size 784x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -365,7 +365,7 @@ layer at (0,0) size 800x1264
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,24) size 0x15
RenderText {TEXT} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 196x15
RenderText {TEXT} at (0,39) size 196x15
diff --git a/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt b/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
index ccc2bc8..022b492 100644
--- a/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
+++ b/LayoutTests/fast/encoding/utf-16-little-endian-expected.txt
@@ -197,7 +197,7 @@ layer at (0,0) size 800x1264
RenderText {TEXT} at (2,2) size 4x18
text run at (2,2) width 4: " "
RenderBlock (anonymous) at (1,173) size 604x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x17
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (0,659) size 784x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -290,7 +290,7 @@ layer at (0,0) size 800x1264
RenderText {TEXT} at (2,2) size 4x18
text run at (2,2) width 4: " "
RenderBlock (anonymous) at (1,173) size 493x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x17
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (0,881) size 784x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -365,7 +365,7 @@ layer at (0,0) size 800x1264
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,24) size 0x15
RenderText {TEXT} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 196x15
RenderText {TEXT} at (0,39) size 196x15
diff --git a/LayoutTests/fast/text/basic/012-expected.txt b/LayoutTests/fast/text/basic/012-expected.txt
index c083842..0ce2d51 100644
--- a/LayoutTests/fast/text/basic/012-expected.txt
+++ b/LayoutTests/fast/text/basic/012-expected.txt
@@ -16,7 +16,7 @@ layer at (0,0) size 800x239
text run at (0,0) width 751: "This bug only seems to occur if the bullet character is non-ASCII (has a Unicode value higher than 127). Non-breaking"
text run at (0,18) width 281: "spaces ( ), however, are an exception."
RenderBlock (anonymous) at (0,151) size 784x72
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderInline {FONT} at (0,0) size 334x54 [color=#CC0000]
RenderText {TEXT} at (0,18) size 334x18
@@ -27,7 +27,7 @@ layer at (0,0) size 800x239
text run at (275,18) width 59: "\x{BB} France "
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,36) size 0x18
RenderText {TEXT} at (0,54) size 334x18
text run at (0,54) width 69: "\x{BB} England "
text run at (69,54) width 60: "\x{BB} Ireland "
diff --git a/LayoutTests/fast/text/whitespace/024-expected.txt b/LayoutTests/fast/text/whitespace/024-expected.txt
index b27226d..277bfc8 100644
--- a/LayoutTests/fast/text/whitespace/024-expected.txt
+++ b/LayoutTests/fast/text/whitespace/024-expected.txt
@@ -51,7 +51,7 @@ layer at (0,0) size 800x1175
text run at (1,1) width 341: "The blank line between '2003' and the nested element "
text run at (342,1) width 142: "triggers the width bug."
RenderBlock (anonymous) at (0,394) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {H2} at (0,431) size 784x28
RenderText {TEXT} at (0,0) size 109x28
@@ -84,7 +84,7 @@ layer at (0,0) size 800x1175
text run at (351,0) width 240: "number of characters contained by the"
text run at (0,18) width 97: "nested element."
RenderBlock (anonymous) at (0,648) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {H2} at (0,685) size 784x28
RenderText {TEXT} at (0,0) size 109x28
@@ -112,7 +112,7 @@ layer at (0,0) size 800x1175
text run at (342,1) width 225: "has been removed, so the bug is not"
text run at (1,19) width 60: "triggered."
RenderBlock (anonymous) at (0,887) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {H2} at (0,924) size 784x28
RenderText {TEXT} at (0,0) size 109x28
@@ -143,6 +143,6 @@ layer at (0,0) size 800x1175
text run at (1,19) width 284: "because now the '2003' is itself contained by "
text run at (285,19) width 292: "a nested element (in this case, another SPAN)."
RenderBlock (anonymous) at (0,1141) size 784x18
- RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,0) size 0x18
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list