[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:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8659f64576de08d16d6c1b05f455e4a6daa50c83
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 30 19:53:04 2003 +0000
Update layout tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/box_properties/margin-expected.txt b/LayoutTests/css1/box_properties/margin-expected.txt
index 2b6103a..abe996b 100644
--- a/LayoutTests/css1/box_properties/margin-expected.txt
+++ b/LayoutTests/css1/box_properties/margin-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 802x2606
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 802x2606
RenderBlock {HTML} at (0,0) size 800x2606
RenderBody {BODY} at (8,8) size 784x2590 [bgcolor=#CCCCCC]
diff --git a/LayoutTests/css1/box_properties/margin_right-expected.txt b/LayoutTests/css1/box_properties/margin_right-expected.txt
index 3ee6f27..7d057be 100644
--- a/LayoutTests/css1/box_properties/margin_right-expected.txt
+++ b/LayoutTests/css1/box_properties/margin_right-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 802x979
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 802x979
RenderBlock {HTML} at (0,0) size 800x979
RenderBody {BODY} at (8,8) size 784x963 [bgcolor=#CCCCCC]
diff --git a/LayoutTests/css1/classification/white_space-expected.txt b/LayoutTests/css1/classification/white_space-expected.txt
index 4ad8a39..3fc5cec 100644
--- a/LayoutTests/css1/classification/white_space-expected.txt
+++ b/LayoutTests/css1/classification/white_space-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 1013x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 1013x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 1013x450
RenderBlock {HTML} at (0,0) size 800x450
RenderBody {BODY} at (8,8) size 784x434 [bgcolor=#CCCCCC]
diff --git a/LayoutTests/css1/color_and_background/background_attachment-expected.txt b/LayoutTests/css1/color_and_background/background_attachment-expected.txt
index 2a786d5..b6e3c97 100644
--- a/LayoutTests/css1/color_and_background/background_attachment-expected.txt
+++ b/LayoutTests/css1/color_and_background/background_attachment-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 880x1140
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 880x1140
RenderBlock {HTML} at (0,0) size 800x1140
RenderBody {BODY} at (8,8) size 784x1124 [bgcolor=#CCCCCC]
diff --git a/LayoutTests/css1/color_and_background/background_repeat-expected.txt b/LayoutTests/css1/color_and_background/background_repeat-expected.txt
index 7c64b8d..3da26aa 100644
--- a/LayoutTests/css1/color_and_background/background_repeat-expected.txt
+++ b/LayoutTests/css1/color_and_background/background_repeat-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 888x1797
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 888x1797
RenderBlock {HTML} at (0,0) size 800x1797
RenderBody {BODY} at (8,8) size 784x1781 [bgcolor=#CCCCCC]
diff --git a/LayoutTests/fast/block/basic/013-expected.txt b/LayoutTests/fast/block/basic/013-expected.txt
index a273e91..470d214 100644
--- a/LayoutTests/fast/block/basic/013-expected.txt
+++ b/LayoutTests/fast/block/basic/013-expected.txt
@@ -4,40 +4,28 @@ layer at (0,0) size 800x203
RenderBlock {HTML} at (0,0) size 800x203
RenderBody {BODY} at (0,0) size 800x203
RenderPartObject {IFRAME} at (0,0) size 500x100
- layer at (0,0) size 91x172
- RenderCanvas at (0,0) size 0x0
- layer at (0,0) size 91x172
- RenderBlock {HTML} at (0,0) size 0x172
- RenderBody {BODY} at (8,8) size 0x150
- RenderBlock {P} at (0,0) size 0x68
- RenderText {TEXT} at (0,0) size 37x68
- text run at (0,0) width 29: "This"
- text run at (0,17) width 12: "is"
- text run at (0,34) width 37: "some"
- text run at (0,51) width 32: "text."
- RenderBlock {P} at (0,82) size 0x68
- RenderText {TEXT} at (0,0) size 83x68
- text run at (0,0) width 29: "This"
- text run at (0,17) width 27: "text"
- text run at (0,34) width 12: "is"
- text run at (0,51) width 83: "underneath."
+ layer at (0,0) size 485x100
+ RenderCanvas at (0,0) size 485x100
+ layer at (0,0) size 485x70
+ RenderBlock {HTML} at (0,0) size 485x70
+ RenderBody {BODY} at (8,8) size 469x48
+ RenderBlock {P} at (0,0) size 469x17
+ RenderText {TEXT} at (0,0) size 122x17
+ text run at (0,0) width 122: "This is some text."
+ RenderBlock {P} at (0,31) size 469x17
+ RenderText {TEXT} at (0,0) size 163x17
+ text run at (0,0) width 163: "This text is underneath."
RenderText {TEXT} at (500,86) size 4x17
text run at (500,86) width 4: " "
RenderPartObject {OBJECT} at (0,103) size 500x100
- layer at (0,0) size 91x172
- RenderCanvas at (0,0) size 0x0
- layer at (0,0) size 91x172
- RenderBlock {HTML} at (0,0) size 0x172
- RenderBody {BODY} at (8,8) size 0x150
- RenderBlock {P} at (0,0) size 0x68
- RenderText {TEXT} at (0,0) size 37x68
- text run at (0,0) width 29: "This"
- text run at (0,17) width 12: "is"
- text run at (0,34) width 37: "some"
- text run at (0,51) width 32: "text."
- RenderBlock {P} at (0,82) size 0x68
- RenderText {TEXT} at (0,0) size 83x68
- text run at (0,0) width 29: "This"
- text run at (0,17) width 27: "text"
- text run at (0,34) width 12: "is"
- text run at (0,51) width 83: "underneath."
+ layer at (0,0) size 485x100
+ RenderCanvas at (0,0) size 485x100
+ layer at (0,0) size 485x70
+ RenderBlock {HTML} at (0,0) size 485x70
+ RenderBody {BODY} at (8,8) size 469x48
+ RenderBlock {P} at (0,0) size 469x17
+ RenderText {TEXT} at (0,0) size 122x17
+ text run at (0,0) width 122: "This is some text."
+ RenderBlock {P} at (0,31) size 469x17
+ RenderText {TEXT} at (0,0) size 163x17
+ text run at (0,0) width 163: "This text is underneath."
diff --git a/LayoutTests/fast/block/float/013-expected.txt b/LayoutTests/fast/block/float/013-expected.txt
index 0664fcc..808035e 100644
--- a/LayoutTests/fast/block/float/013-expected.txt
+++ b/LayoutTests/fast/block/float/013-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 808x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 808x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 800x8
RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0
diff --git a/LayoutTests/fast/block/float/019-expected.txt b/LayoutTests/fast/block/float/019-expected.txt
index 871cdd1..2e13e2b 100644
--- a/LayoutTests/fast/block/float/019-expected.txt
+++ b/LayoutTests/fast/block/float/019-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 2008x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 2008x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 2008x170
RenderBlock {HTML} at (0,0) size 800x170
RenderBody {BODY} at (8,8) size 784x154
diff --git a/LayoutTests/fast/block/float/021-expected.txt b/LayoutTests/fast/block/float/021-expected.txt
index ba05ec5..51cab9e 100644
--- a/LayoutTests/fast/block/float/021-expected.txt
+++ b/LayoutTests/fast/block/float/021-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 1518x3135
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 1518x3135
RenderBlock {HTML} at (0,0) size 800x3135
RenderBody {BODY} at (8,8) size 784x3113
diff --git a/LayoutTests/fast/block/positioning/auto/005-expected.txt b/LayoutTests/fast/block/positioning/auto/005-expected.txt
index 9e9cbdf..f1013cf 100644
--- a/LayoutTests/fast/block/positioning/auto/005-expected.txt
+++ b/LayoutTests/fast/block/positioning/auto/005-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 951x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 951x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 800x84
RenderBlock {HTML} at (0,0) size 800x84
RenderBody {BODY} at (8,8) size 784x68
diff --git a/LayoutTests/fast/compact/001-expected.txt b/LayoutTests/fast/compact/001-expected.txt
index 2b24632..7523bd3 100644
--- a/LayoutTests/fast/compact/001-expected.txt
+++ b/LayoutTests/fast/compact/001-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x70
RenderText {TEXT} at (0,0) size 209x17
text run at (0,0) width 209: "There should be no red below."
RenderBlock {DIV} at (140,31) size 644x17 [color=#FF0000] [bgcolor=#00FF00]
- RenderBlock (compact) {DIV} at (-140,0) size 784x0 [color=#000000] [bgcolor=#000000]
+ RenderBlock (compact) {DIV} at (-140,0) size 769x0 [color=#000000] [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 35x17
text run at (0,0) width 35: "Test:"
RenderInline {SPAN} at (0,0) size 326x17 [color=#000000] [bgcolor=#000000]
diff --git a/LayoutTests/fast/flexbox/016-expected.txt b/LayoutTests/fast/flexbox/016-expected.txt
index a609214..ad289e1 100644
--- a/LayoutTests/fast/flexbox/016-expected.txt
+++ b/LayoutTests/fast/flexbox/016-expected.txt
@@ -1,9 +1,9 @@
-layer at (0,0) size 812x600
- RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 812x600
- RenderBlock {HTML} at (0,0) size 800x600 [bgcolor=#FFFFFF]
- RenderBody {BODY} at (0,0) size 800x600 [bgcolor=#000000]
- RenderFlexibleBox {DIV} at (0,0) size 800x600
+layer at (0,0) size 812x585
+ RenderCanvas at (0,0) size 800x585
+layer at (0,0) size 812x585
+ RenderBlock {HTML} at (0,0) size 800x585 [bgcolor=#FFFFFF]
+ RenderBody {BODY} at (0,0) size 800x585 [bgcolor=#000000]
+ RenderFlexibleBox {DIV} at (0,0) size 800x585
RenderBlock {DIV} at (0,0) size 800x51
RenderText {TEXT} at (0,0) size 799x51
text run at (0,0) width 527: "This header should remain at the top of the browser window as you resize it. "
@@ -12,10 +12,10 @@ layer at (0,0) size 812x600
text run at (0,17) width 347: "should be filled with an olive-bordered green box. "
text run at (347,17) width 441: "It should start beneath the header, end above the footer, and fill"
text run at (0,34) width 228: "the width of the browser window."
- RenderPartObject {IFRAME} at (0,51) size 812x532 [bgcolor=#008000]
- layer at (0,0) size 0x0
- RenderCanvas at (0,0) size 0x0
- RenderBlock {DIV} at (0,583) size 800x17
+ RenderPartObject {IFRAME} at (0,51) size 812x517 [bgcolor=#008000]
+ layer at (0,0) size 777x497
+ RenderCanvas at (0,0) size 777x497
+ RenderBlock {DIV} at (0,568) size 800x17
RenderText {TEXT} at (0,0) size 722x17
text run at (0,0) width 442: "This footer should remain at the bottom of the browser window. "
text run at (442,0) width 280: "It can wrap to multiple lines if necessary."
diff --git a/LayoutTests/fast/frames/001-expected.txt b/LayoutTests/fast/frames/001-expected.txt
index b0439a2..54a0283 100644
--- a/LayoutTests/fast/frames/001-expected.txt
+++ b/LayoutTests/fast/frames/001-expected.txt
@@ -8,16 +8,16 @@ layer at (0,0) size 800x206
RenderBR {BR} at (0,0) size 0x0 [bgcolor=#000000]
RenderText {TEXT} at (0,0) size 0x0
RenderPartObject {IFRAME} at (0,17) size 170x170 [bgcolor=#000000]
- layer at (0,0) size 0x0
- RenderCanvas at (0,0) size 0x0
+ layer at (0,0) size 85x100
+ RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (170,173) size 4x17
text run at (170,173) width 4: " "
RenderPartObject {OBJECT} at (174,17) size 170x170 [bgcolor=#000000]
- layer at (0,0) size 0x0
- RenderCanvas at (0,0) size 0x0
+ layer at (0,0) size 85x100
+ RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (344,173) size 4x17
text run at (344,173) width 4: " "
RenderPartObject {OBJECT} at (348,17) size 170x170 [bgcolor=#000000]
- layer at (0,0) size 0x0
- RenderCanvas at (0,0) size 0x0
+ layer at (0,0) size 85x100
+ RenderCanvas at (0,0) size 85x100
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/frames/empty-frame-src-expected.txt b/LayoutTests/fast/frames/empty-frame-src-expected.txt
index 9baed21..46ca280 100644
--- a/LayoutTests/fast/frames/empty-frame-src-expected.txt
+++ b/LayoutTests/fast/frames/empty-frame-src-expected.txt
@@ -4,17 +4,17 @@ layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 800x600
RenderFrame {FRAME} at (0,0) size 800x197
- layer at (0,0) size 798x193
- RenderCanvas at (0,0) size 798x193
- layer at (0,0) size 798x8
- RenderBlock {HTML} at (0,0) size 798x8
- RenderBody {BODY} at (8,8) size 782x0 [bgcolor=#FF0000]
+ layer at (0,0) size 783x193
+ RenderCanvas at (0,0) size 783x193
+ layer at (0,0) size 783x8
+ RenderBlock {HTML} at (0,0) size 783x8
+ RenderBody {BODY} at (8,8) size 767x0 [bgcolor=#FF0000]
RenderFrame {FRAME} at (0,201) size 800x197
- layer at (0,0) size 798x193
- RenderCanvas at (0,0) size 798x193
- layer at (0,0) size 798x8
- RenderBlock {HTML} at (0,0) size 798x8
- RenderBody {BODY} at (8,8) size 782x0 [bgcolor=#800080]
+ layer at (0,0) size 783x193
+ RenderCanvas at (0,0) size 783x193
+ layer at (0,0) size 783x8
+ RenderBlock {HTML} at (0,0) size 783x8
+ RenderBody {BODY} at (8,8) size 767x0 [bgcolor=#800080]
RenderFrame {FRAME} at (0,402) size 800x197
- layer at (0,0) size 0x0
- RenderCanvas at (0,0) size 0x0
+ layer at (0,0) size 783x193
+ RenderCanvas at (0,0) size 783x193
diff --git a/LayoutTests/fast/overflow/003-expected.txt b/LayoutTests/fast/overflow/003-expected.txt
index b8b8902..be99250 100644
--- a/LayoutTests/fast/overflow/003-expected.txt
+++ b/LayoutTests/fast/overflow/003-expected.txt
@@ -1,4 +1,4 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 0x0
- RenderBlock {COMMENT} at (0,0) size 0x0
+layer at (0,0) size 800x0
+ RenderBlock {COMMENT} at (0,0) size 800x0
diff --git a/LayoutTests/fast/replaced/007-expected.txt b/LayoutTests/fast/replaced/007-expected.txt
index adbbd1f..1af264e 100644
--- a/LayoutTests/fast/replaced/007-expected.txt
+++ b/LayoutTests/fast/replaced/007-expected.txt
@@ -7,19 +7,19 @@ layer at (0,0) size 800x322
RenderText {TEXT} at (155,136) size 173x17
text run at (155,136) width 173: "This should be centered. "
RenderPartObject {IFRAME} at (328,0) size 300x150
- layer at (0,0) size 8x8
- RenderCanvas at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0 [bgcolor=#FF0000]
+ layer at (0,0) size 285x150
+ RenderCanvas at (0,0) size 285x150
+ layer at (0,0) size 285x8
+ RenderBlock {HTML} at (0,0) size 285x8
+ RenderBody {BODY} at (8,8) size 269x0 [bgcolor=#FF0000]
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (155,289) size 173x17
text run at (155,289) width 173: "This should be centered. "
RenderPartObject {OBJECT} at (328,153) size 300x150
- layer at (0,0) size 8x8
- RenderCanvas at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0 [bgcolor=#FF0000]
+ layer at (0,0) size 285x150
+ RenderCanvas at (0,0) size 285x150
+ layer at (0,0) size 285x8
+ RenderBlock {HTML} at (0,0) size 285x8
+ RenderBody {BODY} at (8,8) size 269x0 [bgcolor=#FF0000]
RenderBR {BR} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/table/027-expected.txt b/LayoutTests/fast/table/027-expected.txt
index c07334b..80561dc 100644
--- a/LayoutTests/fast/table/027-expected.txt
+++ b/LayoutTests/fast/table/027-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 823x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 823x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 823x337
RenderBlock {HTML} at (0,0) size 800x337
RenderBody {BODY} at (8,8) size 784x321
diff --git a/LayoutTests/fast/table/034-expected.txt b/LayoutTests/fast/table/034-expected.txt
index 2e30b9a..1a9f749 100644
--- a/LayoutTests/fast/table/034-expected.txt
+++ b/LayoutTests/fast/table/034-expected.txt
@@ -1,5 +1,5 @@
layer at (0,0) size 1064x1276
- RenderCanvas at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 1064x1276
RenderBlock {HTML} at (0,0) size 800x1276
RenderBody {BODY} at (8,8) size 784x1260
diff --git a/LayoutTests/fast/table/037-expected.txt b/LayoutTests/fast/table/037-expected.txt
index 5198e9f..3c5c9c0 100644
--- a/LayoutTests/fast/table/037-expected.txt
+++ b/LayoutTests/fast/table/037-expected.txt
@@ -1,20 +1,14 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 58x158
- RenderBlock {HTML} at (0,0) size 0x158
- RenderBody {BODY} at (8,8) size 0x142
- RenderTable {TABLE} at (0,0) size 44x40
- RenderTableSection {TBODY} at (0,0) size 0x40
+layer at (0,0) size 800x56
+ RenderBlock {HTML} at (0,0) size 800x56
+ RenderBody {BODY} at (8,8) size 784x40
+ RenderTable {TABLE} at (0,0) size 83x23
+ RenderTableSection {TBODY} at (0,0) size 0x23
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,2) size 40x36 [r=0 c=0 rs=1 cs=1]
- RenderText {TEXT} at (1,1) size 38x34
- text run at (1,1) width 35: "Hello"
- text run at (1,18) width 38: "world"
- RenderBlock (anonymous) at (0,40) size 0x102
- RenderText {TEXT} at (0,0) size 50x102
- text run at (0,0) width 35: "Hello"
- text run at (0,17) width 34: "also?"
- text run at (0,34) width 28: "Why"
- text run at (0,51) width 29: "isn't"
- text run at (0,68) width 26: "this"
- text run at (0,85) width 50: "visible?"
+ RenderTableCell {TD} at (2,2) size 79x19 [r=0 c=0 rs=1 cs=1]
+ RenderText {TEXT} at (1,1) size 77x17
+ text run at (1,1) width 77: "Hello world"
+ RenderBlock (anonymous) at (0,23) size 784x17
+ RenderText {TEXT} at (0,0) size 222x17
+ text run at (0,0) width 222: "Hello also? Why isn't this visible?"
diff --git a/LayoutTests/fast/table/wide-colspan-expected.txt b/LayoutTests/fast/table/wide-colspan-expected.txt
index bb0d843..f082477 100644
--- a/LayoutTests/fast/table/wide-colspan-expected.txt
+++ b/LayoutTests/fast/table/wide-colspan-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 1614x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 1614x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 1614x126
RenderBlock {HTML} at (0,0) size 800x126
RenderBody {BODY} at (8,8) size 784x110
diff --git a/LayoutTests/fast/table/wide-column-expected.txt b/LayoutTests/fast/table/wide-column-expected.txt
index 4c0dbf0..d128a11 100644
--- a/LayoutTests/fast/table/wide-column-expected.txt
+++ b/LayoutTests/fast/table/wide-column-expected.txt
@@ -1,5 +1,5 @@
-layer at (0,0) size 1614x600
- RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 1614x585
+ RenderCanvas at (0,0) size 800x585
layer at (0,0) size 1614x72
RenderBlock {HTML} at (0,0) size 800x72
RenderBody {BODY} at (8,8) size 784x56
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list