[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jamesr at google.com
jamesr at google.com
Wed Dec 22 11:26:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 314dbe04b7001a1e387298612d18e99da475956a
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 23 22:34:29 2010 +0000
2010-07-23 James Robinson <jamesr at chromium.org>
Unreviewed. Add chromium expectations for new tests.
* platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum:
* platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png:
* platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum:
* platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png:
* platform/chromium-win/tables/layering: Added.
* platform/chromium-win/tables/layering/paint-test-layering-1-expected.checksum: Added.
* platform/chromium-win/tables/layering/paint-test-layering-1-expected.png: Added.
* platform/chromium-win/tables/layering/paint-test-layering-1-expected.txt: Added.
* platform/chromium-win/tables/layering/paint-test-layering-2-expected.checksum: Added.
* platform/chromium-win/tables/layering/paint-test-layering-2-expected.png: Added.
* platform/chromium-win/tables/layering/paint-test-layering-2-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ea6fcab..28f5d14 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-23 James Robinson <jamesr at chromium.org>
+
+ Unreviewed. Add chromium expectations for new tests.
+
+ * platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum:
+ * platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png:
+ * platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum:
+ * platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png:
+ * platform/chromium-win/tables/layering: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-1-expected.checksum: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-1-expected.png: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-1-expected.txt: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-2-expected.checksum: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-2-expected.png: Added.
+ * platform/chromium-win/tables/layering/paint-test-layering-2-expected.txt: Added.
+
2010-07-23 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum
index 663a3d4..12dd50b 100644
--- a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum
+++ b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.checksum
@@ -1 +1 @@
-74f85aff0ca32f568d65d23112496aef
\ No newline at end of file
+d78241b8a4ffa709fd81ba2748a39f2a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png
index a590c92..42be564 100644
Binary files a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png and b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-1-expected.png differ
diff --git a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum
index bc3ff1e..d037e86 100644
--- a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum
+++ b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.checksum
@@ -1 +1 @@
-d3aa1e78efe6c6e3063272d385ee0134
\ No newline at end of file
+e119765d4fa6eaf100e31a6470c9e527
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png
index d0e126e..6e27e16 100644
Binary files a/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png and b/LayoutTests/platform/chromium-mac/tables/layering/paint-test-layering-2-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.checksum b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.checksum
new file mode 100644
index 0000000..75ea2d1
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.checksum
@@ -0,0 +1 @@
+6d1be08f779064092eb3caf0d898ce91
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.png b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.png
new file mode 100644
index 0000000..bb9925f
Binary files /dev/null and b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.txt b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.txt
new file mode 100644
index 0000000..747c4b7
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-1-expected.txt
@@ -0,0 +1,54 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 746x39
+ text run at (0,0) width 746: "This test checks the renderer's ability to layer multiple cells in a table on top of one another. This test has three cells that span"
+ text run at (0,20) width 172: "multiple table grid slots. The "
+ RenderInline {SPAN} at (0,0) size 22x19 [color=#FF0000]
+ RenderText {#text} at (172,20) size 22x19
+ text run at (172,20) width 22: "red"
+ RenderText {#text} at (194,20) size 367x19
+ text run at (194,20) width 367: " cell starts at row 1 and column 3 and spans three rows. The "
+ RenderInline {SPAN} at (0,0) size 28x19 [color=#0000FF]
+ RenderText {#text} at (561,20) size 28x19
+ text run at (561,20) width 28: "blue"
+ RenderText {#text} at (589,20) size 781x39
+ text run at (589,20) width 192: " cell starts at row 2, and column"
+ text run at (0,40) width 278: "2, and spans two columns and two rows. The "
+ RenderInline {SPAN} at (0,0) size 38x19 [color=#008000]
+ RenderText {#text} at (278,40) size 38x19
+ text run at (278,40) width 38: "green"
+ RenderText {#text} at (316,40) size 187x19
+ text run at (316,40) width 187: " cell spans 4 columns of row 3."
+ RenderBlock {P} at (0,76) size 784x20
+ RenderText {#text} at (0,0) size 771x19
+ text run at (0,0) width 771: "If the test succeeds then you should see no text inside the table. If you see the text 'FAIL' inside the table, then the test has failed."
+ RenderTable {TABLE} at (0,112) size 102x82 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 100x80
+ RenderTableRow {TR} at (0,2) size 100x24
+ RenderTableCell {TD} at (2,2) size 20x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (24,2) size 20x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (46,54) size 52x24 [bgcolor=#FF0000] [border: (1px inset #808080)] [r=0 c=2 rs=3 cs=1]
+ RenderBlock {DIV} at (2,2) size 48x20
+ RenderText {#text} at (0,0) size 48x19
+ text run at (0,0) width 48: " "
+ RenderTableRow {TR} at (0,28) size 100x24
+ RenderTableCell {TD} at (2,28) size 20x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (24,54) size 74x24 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=1 rs=2 cs=2]
+ RenderBlock {DIV} at (2,2) size 70x20 [color=#008000]
+ RenderText {#text} at (16,0) size 54x19
+ text run at (16,0) width 54: " FAIL "
+ RenderTableRow {TR} at (0,54) size 100x24
+ RenderTableCell {TD} at (2,54) size 96x24 [bgcolor=#008000] [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=3]
+ RenderBlock {DIV} at (2,2) size 92x20
+ RenderText {#text} at (84,0) size 8x19
+ text run at (84,0) width 8: " "
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.checksum b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.checksum
new file mode 100644
index 0000000..b82affd
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.checksum
@@ -0,0 +1 @@
+5a1cf0890a09fb5abdf75f15ddf75746
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.png b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.png
new file mode 100644
index 0000000..1f40a94
Binary files /dev/null and b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.txt b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.txt
new file mode 100644
index 0000000..57ad571
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/tables/layering/paint-test-layering-2-expected.txt
@@ -0,0 +1,64 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x60
+ RenderText {#text} at (0,0) size 746x39
+ text run at (0,0) width 746: "This test checks the renderer's ability to layer multiple cells in a table on top of one another. This test has three cells that span"
+ text run at (0,20) width 172: "multiple table grid slots. The "
+ RenderInline {SPAN} at (0,0) size 22x19 [color=#FF0000]
+ RenderText {#text} at (172,20) size 22x19
+ text run at (172,20) width 22: "red"
+ RenderText {#text} at (194,20) size 361x19
+ text run at (194,20) width 361: " cell starts at row 1 and column 4 and spans four rows. The "
+ RenderInline {SPAN} at (0,0) size 28x19 [color=#0000FF]
+ RenderText {#text} at (555,20) size 28x19
+ text run at (555,20) width 28: "blue"
+ RenderText {#text} at (583,20) size 775x39
+ text run at (583,20) width 192: " cell starts at row 2, and column"
+ text run at (0,40) width 192: "1, and spans four columns. The "
+ RenderInline {SPAN} at (0,0) size 38x19 [color=#008000]
+ RenderText {#text} at (192,40) size 38x19
+ text run at (192,40) width 38: "green"
+ RenderText {#text} at (230,40) size 187x19
+ text run at (230,40) width 187: " cell spans 4 columns of row 4."
+ RenderBlock {P} at (0,76) size 784x20
+ RenderText {#text} at (0,0) size 771x19
+ text run at (0,0) width 771: "If the test succeeds then you should see no text inside the table. If you see the text 'FAIL' inside the table, then the test has failed."
+ RenderTable {TABLE} at (0,112) size 188x108 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 186x106
+ RenderTableRow {TR} at (0,2) size 186x24
+ RenderTableCell {TD} at (2,2) size 44x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (48,2) size 44x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (94,2) size 44x24 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 16x19
+ text run at (2,2) width 16: " "
+ RenderTableCell {TD} at (140,41) size 44x24 [bgcolor=#FF0000] [border: (1px inset #808080)] [r=0 c=3 rs=4 cs=1]
+ RenderBlock {DIV} at (2,2) size 40x20
+ RenderText {#text} at (0,0) size 40x19
+ text run at (0,0) width 40: " "
+ RenderTableRow {TR} at (0,28) size 186x24
+ RenderTableCell {TD} at (2,28) size 182x24 [bgcolor=#0000FF] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=4]
+ RenderBlock {DIV} at (2,2) size 178x20
+ RenderText {#text} at (138,0) size 40x19
+ text run at (138,0) width 40: " "
+ RenderTableRow {TR} at (0,54) size 186x24
+ RenderTableCell {TD} at (2,54) size 44x24 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 40x19
+ text run at (2,2) width 40: " "
+ RenderTableCell {TD} at (48,54) size 44x24 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 40x19
+ text run at (2,2) width 40: " "
+ RenderTableCell {TD} at (94,54) size 44x24 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 40x19
+ text run at (2,2) width 40: " "
+ RenderTableRow {TR} at (0,80) size 186x24
+ RenderTableCell {TD} at (2,80) size 182x24 [bgcolor=#008000] [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=4]
+ RenderBlock {DIV} at (2,2) size 178x20 [color=#008000]
+ RenderText {#text} at (140,0) size 38x19
+ text run at (140,0) width 38: "FAIL "
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list