[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 08:09:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4b2106f2584d87697df7e839b756474d8690249d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 4 20:06:25 2003 +0000
Update the layout tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/acid_test-expected.txt b/LayoutTests/css1/box_properties/acid_test-expected.txt
index c8c9c8c..77cd018 100644
--- a/LayoutTests/css1/box_properties/acid_test-expected.txt
+++ b/LayoutTests/css1/box_properties/acid_test-expected.txt
@@ -25,12 +25,12 @@ layer at (0,0) size 800x420
RenderBlock {P} at (0,0) size 139x19
RenderText {TEXT} at (0,4) size 28x18
text run at (0,4) width 28: "bang "
- RenderRadioButton {INPUT} at (31,3) size 12x13 [color=#000000]
+ RenderRadioButton {INPUT} at (31,3) size 12x13
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,19) size 139x19
RenderText {TEXT} at (0,4) size 47x18
text run at (0,4) width 47: "whimper "
- RenderRadioButton {INPUT} at (50,3) size 12x13 [color=#000000]
+ RenderRadioButton {INPUT} at (50,3) size 12x13
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (10,58) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
diff --git a/LayoutTests/fast/block/basic/011-expected.txt b/LayoutTests/fast/block/basic/011-expected.txt
index c8c9c8c..77cd018 100644
--- a/LayoutTests/fast/block/basic/011-expected.txt
+++ b/LayoutTests/fast/block/basic/011-expected.txt
@@ -25,12 +25,12 @@ layer at (0,0) size 800x420
RenderBlock {P} at (0,0) size 139x19
RenderText {TEXT} at (0,4) size 28x18
text run at (0,4) width 28: "bang "
- RenderRadioButton {INPUT} at (31,3) size 12x13 [color=#000000]
+ RenderRadioButton {INPUT} at (31,3) size 12x13
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,19) size 139x19
RenderText {TEXT} at (0,4) size 47x18
text run at (0,4) width 47: "whimper "
- RenderRadioButton {INPUT} at (50,3) size 12x13 [color=#000000]
+ RenderRadioButton {INPUT} at (50,3) size 12x13
RenderText {TEXT} at (0,0) size 0x0
RenderBlock (anonymous) at (10,58) size 139x0 [bgcolor=#000000]
RenderInline {FORM} at (0,0) size 0x0
diff --git a/LayoutTests/fast/parser/fonts-expected.txt b/LayoutTests/fast/parser/fonts-expected.txt
new file mode 100644
index 0000000..52c6252
--- /dev/null
+++ b/LayoutTests/fast/parser/fonts-expected.txt
@@ -0,0 +1,83 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x524
+ RenderBlock {HTML} at (0,0) size 800x524
+ RenderBody {BODY} at (8,8) size 784x500
+ RenderBlock (anonymous) at (0,0) size 784x18
+ RenderInline {DIV} at (0,0) size 528x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,1) size 528x16
+ text run at (0,1) width 528: "Ahem_font_required_for_this_test."
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,34) size 752x18 [color=#008000]
+ RenderText {TEXT} at (0,0) size 360x18
+ text run at (0,0) width 360: "This line should be green. There should be no red below."
+ RenderBlock {P} at (16,68) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-a"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,100) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-b"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,132) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-c"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,164) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-d"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,196) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-e"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,228) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-f"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,260) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-g"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,292) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-h"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,324) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-i"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,356) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-j"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,388) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-k"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,420) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-l"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,452) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-m"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {P} at (16,484) size 96x16 [color=#008000]
+ RenderInline {SPAN} at (0,0) size 96x16 [color=#FFFFFF] [bgcolor=#FF0000]
+ RenderText {TEXT} at (0,0) size 96x16
+ text run at (0,0) width 96: "FAIL-n"
+ RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/parser/fonts.html b/LayoutTests/fast/parser/fonts.html
new file mode 100644
index 0000000..589de25
--- /dev/null
+++ b/LayoutTests/fast/parser/fonts.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+ <head>
+ <title>Parsing the 'font' shorthand</title>
+ <style type="text/css">
+ .control { display: inline; font: 1em/1 Ahem, sans-serif; background: red; color: white; }
+ p { color: green; margin: 1em; }
+ .test { width: 6em; }
+ span { background: red; color: white; }
+ .a { font: normal normal normal 1em/normal Ahem, serif; }
+ .b { font: normal normal normal medium/normal Ahem, serif; }
+ .c { font: normal normal normal medium/1 Ahem, serif; }
+ .d { font: normal normal normal 1em/1 Ahem, serif; }
+ .e { font: normal normal 1em/1 Ahem, serif; }
+ .f { font: normal 1em/1 Ahem, serif; }
+ .g { font: 1em/1 Ahem, serif; }
+ .h { font: normal normal normal 1em Ahem, serif; }
+ .i { font: normal normal normal medium Ahem, serif; }
+ .j { font: normal normal normal medium Ahem, serif; }
+ .k { font: normal normal normal 1em Ahem, serif; }
+ .l { font: normal normal 1em Ahem, serif; }
+ .m { font: normal 1em Ahem, serif; }
+ .n { font: 1em Ahem, serif; }
+ </style>
+ </head>
+ <body>
+ <div class="control">Ahem_font_required_for_this_test.</div>
+
+ <p>This line should be green. There should be no red below.</p>
+
+ <p class="test a"> <span>FAIL-a</span> </p>
+ <p class="test b"> <span>FAIL-b</span> </p>
+ <p class="test c"> <span>FAIL-c</span> </p>
+ <p class="test d"> <span>FAIL-d</span> </p>
+ <p class="test e"> <span>FAIL-e</span> </p>
+ <p class="test f"> <span>FAIL-f</span> </p>
+ <p class="test g"> <span>FAIL-g</span> </p>
+ <p class="test h"> <span>FAIL-h</span> </p>
+ <p class="test i"> <span>FAIL-i</span> </p>
+ <p class="test j"> <span>FAIL-j</span> </p>
+ <p class="test k"> <span>FAIL-k</span> </p>
+ <p class="test l"> <span>FAIL-l</span> </p>
+ <p class="test m"> <span>FAIL-m</span> </p>
+ <p class="test n"> <span>FAIL-n</span> </p>
+
+ </body>
+</html>
diff --git a/LayoutTests/fast/text/whitespace/027-expected.txt b/LayoutTests/fast/text/whitespace/027-expected.txt
index 2ce652d..d24c395 100644
--- a/LayoutTests/fast/text/whitespace/027-expected.txt
+++ b/LayoutTests/fast/text/whitespace/027-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x354
- RenderBlock {HTML} at (0,0) size 800x354
- RenderBody {BODY} at (8,8) size 784x338
+layer at (0,0) size 800x318
+ RenderBlock {HTML} at (0,0) size 800x318
+ RenderBody {BODY} at (8,8) size 784x302
RenderTable {TABLE} at (0,0) size 784x28
RenderTableSection {TBODY} at (0,0) size 0x28
RenderTableRow {TR} at (0,0) size 0x0
@@ -31,16 +31,16 @@ layer at (0,0) size 800x354
text run at (2,182) width 53: "from the"
RenderText {TEXT} at (0,0) size 0x0
RenderTableCell {TD} at (80,103) size 702x2 [r=0 c=1 rs=1 cs=1]
- RenderTable {TABLE} at (0,236) size 784x102
- RenderTableSection {TBODY} at (2,2) size 0x98
+ RenderTable {TABLE} at (0,236) size 784x66
+ RenderTableSection {TBODY} at (2,2) size 0x62
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,2) size 573x94 [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (2,2) size 573x58 [r=0 c=0 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 131x18
text run at (2,2) width 131: "This is a test to see if"
- RenderInline {SPAN} at (0,0) size 569x90
- RenderText {TEXT} at (133,2) size 569x90
+ RenderInline {SPAN} at (0,0) size 569x54
+ RenderText {TEXT} at (133,2) size 569x54
text run at (133,2) width 102: "this is computed"
- text run at (2,38) width 569: "correctly. In particular, we have a really long line here that could throw off the min-width."
- text run at (2,74) width 30: "Is it?"
+ text run at (2,20) width 569: "correctly. In particular, we have a really long line here that could throw off the min-width."
+ text run at (2,38) width 30: "Is it?"
RenderText {TEXT} at (0,0) size 0x0
- RenderTableCell {TD} at (577,47) size 201x4 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (577,29) size 201x4 [r=0 c=1 rs=1 cs=1]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list