Diff
Modified: trunk/LayoutTests/ChangeLog (117405 => 117406)
--- trunk/LayoutTests/ChangeLog 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/ChangeLog 2012-05-17 07:07:23 UTC (rev 117406)
@@ -1,3 +1,27 @@
+2012-05-17 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt] Unreviewed gardening after r117339.
+ https://bugs.webkit.org/show_bug.cgi?id=84167
+
+ * platform/qt/Skipped:
+ * platform/qt/editing/pasteboard/innerText-inline-table-expected.png:
+ * platform/qt/editing/pasteboard/innerText-inline-table-expected.txt:
+ * platform/qt/editing/selection/iframe-expected.png:
+ * platform/qt/editing/selection/iframe-expected.txt:
+ * platform/qt/editing/selection/inline-table-expected.png:
+ * platform/qt/editing/selection/inline-table-expected.txt:
+ * platform/qt/editing/selection/table-caret-3-expected.png:
+ * platform/qt/editing/selection/table-caret-3-expected.txt:
+ * platform/qt/fast/css-generated-content/inline-display-types-expected.png:
+ * platform/qt/fast/css-generated-content/inline-display-types-expected.txt:
+ * platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.png:
+ * platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.txt: Added.
+ * platform/qt/fast/inline-block/001-expected.png:
+ * platform/qt/fast/inline-block/001-expected.txt:
+ * platform/qt/tables/mozilla/bugs/bug2479-2-expected.png:
+ * platform/qt/tables/mozilla/bugs/bug2479-2-expected.txt:
+ * platform/qt/test_expectations.txt:
+
2012-05-16 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r117372.
Modified: trunk/LayoutTests/platform/qt/Skipped (117405 => 117406)
--- trunk/LayoutTests/platform/qt/Skipped 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-05-17 07:07:23 UTC (rev 117406)
@@ -2480,7 +2480,6 @@
# REGRESSION(r116134): It made 3 inspector tests fail
inspector/debugger/scripts-panel.html
-inspector/debugger/snippets-model.html
inspector/debugger/source-frame.html
# [Qt] new test http/tests/cookies/single-quoted-value.html is failing
Modified: trunk/LayoutTests/platform/qt/editing/pasteboard/innerText-inline-table-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/editing/pasteboard/innerText-inline-table-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/innerText-inline-table-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/innerText-inline-table-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -6,29 +6,29 @@
RenderBlock {DIV} at (0,0) size 784x21
RenderText {#text} at (0,0) size 551x21
text run at (0,0) width 551: "Checks that the text iterator is emitting a space before and after an inline table."
- RenderBlock {DIV} at (0,21) size 784x32
- RenderText {#text} at (0,11) size 35x21
- text run at (0,11) width 35: "hello"
+ RenderBlock {DIV} at (0,21) size 784x29
+ RenderText {#text} at (0,8) size 35x21
+ text run at (0,8) width 35: "hello"
RenderTable {TABLE} at (35,0) size 15x27
RenderTableSection {TBODY} at (0,0) size 15x27
RenderTableRow {TR} at (0,2) size 15x23
RenderTableCell {TD} at (2,2) size 11x23 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 9x21
text run at (1,1) width 9: "1"
- RenderText {#text} at (50,11) size 39x21
- text run at (50,11) width 39: "world"
- RenderBlock {DIV} at (0,53) size 784x32
- RenderText {#text} at (0,11) size 26x21
- text run at (0,11) width 26: "foo "
+ RenderText {#text} at (50,8) size 39x21
+ text run at (50,8) width 39: "world"
+ RenderBlock {DIV} at (0,50) size 784x29
+ RenderText {#text} at (0,8) size 26x21
+ text run at (0,8) width 26: "foo "
RenderTable {TABLE} at (26,0) size 15x27
RenderTableSection {TBODY} at (0,0) size 15x27
RenderTableRow {TR} at (0,2) size 15x23
RenderTableCell {TD} at (2,2) size 11x23 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 9x21
text run at (1,1) width 9: "2"
- RenderText {#text} at (41,11) size 27x21
- text run at (41,11) width 27: " bar"
- RenderBlock {UL} at (0,101) size 784x21
+ RenderText {#text} at (41,8) size 27x21
+ text run at (41,8) width 27: " bar"
+ RenderBlock {UL} at (0,95) size 784x21
RenderListItem {LI} at (40,0) size 744x21
RenderBlock {PRE} at (0,0) size 744x21
RenderListMarker at (-18,0) size 7x21: bullet
Modified: trunk/LayoutTests/platform/qt/editing/selection/iframe-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/editing/selection/iframe-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/editing/selection/iframe-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/editing/selection/iframe-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -197,11 +197,11 @@
RenderText {#text} at (0,186) size 52x21
text run at (0,186) width 52: "iframe: "
RenderPartObject {IFRAME} at (52,0) size 402x202 [border: (1px solid #000000)]
- layer at (0,0) size 384x248
+ layer at (0,0) size 384x243
RenderView at (0,0) size 384x200
- layer at (0,0) size 384x248
- RenderBlock {HTML} at (0,0) size 384x248
- RenderBody {BODY} at (8,8) size 368x232
+ layer at (0,0) size 384x243
+ RenderBlock {HTML} at (0,0) size 384x243
+ RenderBody {BODY} at (8,8) size 368x227
RenderBlock {P} at (0,0) size 368x126
RenderText {#text} at (0,0) size 351x126
text run at (0,0) width 351: "This tests caret movement through an inline table."
@@ -211,10 +211,10 @@
text run at (0,63) width 347: "shouldn't skip across the table, but should enter it"
text run at (0,84) width 324: "(unless we later decide that we don't want this"
text run at (0,105) width 71: "behavior)."
- RenderBlock {DIV} at (0,142) size 368x90
- RenderBlock {DIV} at (0,0) size 368x90
- RenderText {#text} at (0,69) size 88x21
- text run at (0,69) width 88: "Inline Table:"
+ RenderBlock {DIV} at (0,142) size 368x85
+ RenderBlock {DIV} at (0,0) size 368x85
+ RenderText {#text} at (0,10) size 88x21
+ text run at (0,10) width 88: "Inline Table:"
RenderTable {TABLE} at (88,0) size 147x85 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 145x83
RenderTableRow {TR} at (0,2) size 145x25
@@ -247,8 +247,8 @@
RenderTableCell {TD} at (97,56) size 46x25 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 34x21
text run at (2,2) width 34: "Nine"
- RenderText {#text} at (235,69) size 73x21
- text run at (235,69) width 73: "The End..."
+ RenderText {#text} at (235,10) size 73x21
+ text run at (235,10) width 73: "The End..."
RenderText {#text} at (454,186) size 73x21
text run at (454,186) width 73: " the end ..."
caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/editing/selection/inline-table-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/editing/selection/inline-table-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/editing/selection/inline-table-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/editing/selection/inline-table-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -151,10 +151,10 @@
text run at (0,21) width 201: "table, as if it were an image. "
text run at (201,21) width 534: "The caret shouldn't skip across the table, but should enter it (unless we later"
text run at (0,42) width 283: "decide that we don't want this behavior)."
- RenderBlock {DIV} at (0,79) size 784x90
- RenderBlock {DIV} at (0,0) size 784x90
- RenderText {#text} at (0,69) size 88x21
- text run at (0,69) width 88: "Inline Table:"
+ RenderBlock {DIV} at (0,79) size 784x85
+ RenderBlock {DIV} at (0,0) size 784x85
+ RenderText {#text} at (0,10) size 88x21
+ text run at (0,10) width 88: "Inline Table:"
RenderTable {TABLE} at (88,0) size 147x85 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 145x83
RenderTableRow {TR} at (0,2) size 145x25
@@ -187,6 +187,6 @@
RenderTableCell {TD} at (97,56) size 46x25 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
RenderText {#text} at (2,2) size 34x21
text run at (2,2) width 34: "Nine"
- RenderText {#text} at (235,69) size 73x21
- text run at (235,69) width 73: "The End..."
+ RenderText {#text} at (235,10) size 73x21
+ text run at (235,10) width 73: "The End..."
caret: position 1 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/editing/selection/table-caret-3-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/editing/selection/table-caret-3-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/editing/selection/table-caret-3-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/editing/selection/table-caret-3-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -9,9 +9,9 @@
RenderBlock {P} at (0,0) size 784x21
RenderText {#text} at (0,0) size 423x21
text run at (0,0) width 423: "This tests the caret position for the caret after an inline table."
- RenderBlock {DIV} at (0,37) size 784x90
- RenderText {#text} at (0,69) size 22x21
- text run at (0,69) width 22: "foo"
+ RenderBlock {DIV} at (0,37) size 784x85
+ RenderText {#text} at (0,10) size 22x21
+ text run at (0,10) width 22: "foo"
RenderTable {TABLE} at (22,0) size 58x85 [border: (1px solid #999999)]
RenderTableSection {TBODY} at (1,1) size 56x83
RenderTableRow {TR} at (0,2) size 56x25
@@ -26,6 +26,6 @@
RenderTableCell {TD} at (2,56) size 52x25 [border: (1px solid #999999)] [r=2 c=0 rs=1 cs=1]
RenderText {#text} at (2,2) size 48x21
text run at (2,2) width 48: "a table"
- RenderText {#text} at (80,69) size 26x21
- text run at (80,69) width 26: "baz"
+ RenderText {#text} at (80,10) size 26x21
+ text run at (80,10) width 26: "baz"
caret: position 1 of child 1 {TABLE} of child 2 {DIV} of body
Modified: trunk/LayoutTests/platform/qt/fast/css-generated-content/inline-display-types-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/fast/css-generated-content/inline-display-types-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/fast/css-generated-content/inline-display-types-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/fast/css-generated-content/inline-display-types-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -18,19 +18,19 @@
text run at (0,0) width 35: "Test:"
RenderText {#text} at (35,0) size 52x21
text run at (35,0) width 52: "content"
- RenderBlock {DIV} at (0,105) size 784x26
+ RenderBlock {DIV} at (0,105) size 784x21
RenderTable at (0,0) size 35x21
RenderTableSection (anonymous) at (0,0) size 35x21
RenderTableRow (anonymous) at (0,0) size 35x21
RenderTableCell (anonymous) at (0,0) size 35x21 [r=0 c=0 rs=1 cs=1]
RenderText at (0,0) size 35x21
text run at (0,0) width 35: "Test:"
- RenderText {#text} at (35,5) size 52x21
- text run at (35,5) width 52: "content"
- RenderBlock {H1} at (0,152) size 784x42
+ RenderText {#text} at (35,0) size 52x21
+ text run at (35,0) width 52: "content"
+ RenderBlock {H1} at (0,147) size 784x42
RenderText {#text} at (0,0) size 103x42
text run at (0,0) width 103: "Inlines"
- RenderBlock (anonymous) at (0,215) size 784x68
+ RenderBlock (anonymous) at (0,210) size 784x63
RenderInline {SPAN} at (0,0) size 91x21
RenderInline (generated) at (0,0) size 39x21
RenderText at (0,0) size 39x21
@@ -52,6 +52,6 @@
RenderTableCell (anonymous) at (0,0) size 35x21 [r=0 c=0 rs=1 cs=1]
RenderText at (0,0) size 35x21
text run at (0,0) width 35: "Test:"
- RenderText {#text} at (35,47) size 52x21
- text run at (35,47) width 52: "content"
- RenderBR {BR} at (87,63) size 0x0
+ RenderText {#text} at (35,42) size 52x21
+ text run at (35,42) width 52: "content"
+ RenderBR {BR} at (87,58) size 0x0
Modified: trunk/LayoutTests/platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.png
(Binary files differ)
Added: trunk/LayoutTests/platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.txt (0 => 117406)
--- trunk/LayoutTests/platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/fast/css-generated-content/nested-tables-with-before-after-content-crash-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -0,0 +1,24 @@
+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
+ RenderTable {DIV} at (0,0) size 48x16 [color=#0000FF]
+ RenderTableSection (anonymous) at (0,0) size 48x16
+ RenderTableRow (anonymous) at (0,0) size 48x16
+ RenderTableCell (anonymous) at (0,0) size 48x16 [r=0 c=0 rs=1 cs=1]
+ RenderInline (generated) at (0,0) size 16x17 [color=#FF0000]
+ RenderCounter at (0,0) size 16x17
+ text run at (0,0) width 16: "0"
+ RenderTable {Q} at (16,0) size 32x16
+ RenderTableSection (anonymous) at (0,0) size 32x16
+ RenderTableRow (anonymous) at (0,0) size 32x16
+ RenderTableCell (anonymous) at (0,0) size 32x16 [r=0 c=0 rs=1 cs=1]
+ RenderInline (generated) at (0,0) size 16x17
+ RenderQuote at (0,0) size 16x17
+ text run at (0,0) width 16: "\""
+ RenderInline (generated) at (0,0) size 16x17
+ RenderQuote at (16,0) size 16x17
+ text run at (16,0) width 16: "\""
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/qt/fast/inline-block/001-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/fast/inline-block/001-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/fast/inline-block/001-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/fast/inline-block/001-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -3,47 +3,86 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderText {#text} at (0,0) size 760x42
- text run at (0,0) width 760: "THIS TEST'S RESULTS ARE NOT CORRECT, SINCE INLINE TABLES ARE NOT BASELINE-ALIGNING"
- text run at (0,21) width 522: "PROPERLY, AND WHEN THEY DO, THE FIRST ROW WILL BE USED. "
- RenderBR {BR} at (522,37) size 0x0
- RenderBlock {P} at (0,49) size 64x46 [border: (2px solid #0000FF)]
- RenderText {#text} at (2,2) size 60x21
- text run at (2,2) width 60: "This text"
- RenderBR {BR} at (62,18) size 0x0
- RenderText {#text} at (2,23) size 60x21
- text run at (2,23) width 60: "This text"
- RenderText {#text} at (64,72) size 4x21
- text run at (64,72) width 4: " "
- RenderBlock {P} at (68,49) size 129x46 [border: (2px solid #0000FF)]
- RenderBlock {SPAN} at (2,2) size 125x42
- RenderText {#text} at (0,0) size 91x21
- text run at (0,0) width 91: "should all be"
- RenderBR {BR} at (91,16) size 0x0
- RenderText {#text} at (0,21) size 125x21
- text run at (0,21) width 125: "should also all be"
- RenderText {#text} at (197,72) size 4x21
- text run at (197,72) width 4: " "
- RenderTable {TABLE} at (201,42) size 48x46 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 44x42
- RenderTableRow {TR} at (0,0) size 44x21
- RenderTableCell {TD} at (0,0) size 44x21 [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (0,0) size 44x21
- text run at (0,0) width 44: "on the"
- RenderTableRow {TR} at (0,21) size 44x21
- RenderTableCell {TD} at (0,21) size 44x21 [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (0,0) size 44x21
- text run at (0,0) width 44: "on the"
- RenderText {#text} at (249,72) size 4x21
- text run at (249,72) width 4: " "
- RenderTable {TABLE} at (253,42) size 81x46 [border: (2px solid #0000FF)]
- RenderTableSection {TBODY} at (2,2) size 77x42
+ RenderText {#text} at (0,0) size 274x21
+ text run at (0,0) width 274: "The two blue boxes should be aligned."
+ RenderBR {BR} at (274,16) size 0x0
+ RenderText {#text} at (0,21) size 266x21
+ text run at (0,21) width 266: "The two red boxes should be aligned."
+ RenderBR {BR} at (266,37) size 0x0
+ RenderText {#text} at (0,42) size 381x21
+ text run at (0,42) width 381: "The text in the blue boxes should be on the same line."
+ RenderBR {BR} at (381,58) size 0x0
+ RenderText {#text} at (0,63) size 373x21
+ text run at (0,63) width 373: "The text in the red boxes should be on the same line."
+ RenderBR {BR} at (373,79) size 0x0
+ RenderText {#text} at (0,84) size 697x21
+ text run at (0,84) width 697: "The top of the first red box should line up with the bottom of the second last line of the last blue box."
+ RenderBR {BR} at (697,100) size 0x0
+ RenderBlock {P} at (0,105) size 71x88 [border: (2px solid #0000FF)]
+ RenderText {#text} at (2,2) size 67x21
+ text run at (2,2) width 67: "All on the"
+ RenderBR {BR} at (69,18) size 0x0
+ RenderText {#text} at (2,23) size 67x21
+ text run at (2,23) width 67: "All on the"
+ RenderBR {BR} at (69,39) size 0x0
+ RenderText {#text} at (2,44) size 67x21
+ text run at (2,44) width 67: "All on the"
+ RenderBR {BR} at (69,60) size 0x0
+ RenderText {#text} at (2,65) size 67x21
+ text run at (2,65) width 67: "All on the"
+ RenderText {#text} at (71,170) size 4x21
+ text run at (71,170) width 4: " "
+ RenderBlock {P} at (75,105) size 77x88 [border: (2px solid #0000FF)]
+ RenderBlock {SPAN} at (2,2) size 73x84
+ RenderText {#text} at (0,0) size 73x21
+ text run at (0,0) width 73: "same line."
+ RenderBR {BR} at (73,16) size 0x0
+ RenderText {#text} at (0,21) size 73x21
+ text run at (0,21) width 73: "same line."
+ RenderBR {BR} at (73,37) size 0x0
+ RenderText {#text} at (0,42) size 73x21
+ text run at (0,42) width 73: "same line."
+ RenderBR {BR} at (73,58) size 0x0
+ RenderText {#text} at (0,63) size 73x21
+ text run at (0,63) width 73: "same line."
+ RenderText {#text} at (152,170) size 4x21
+ text run at (152,170) width 4: " "
+ RenderTable {TABLE} at (156,163) size 71x88 [border: (2px solid #FF0000)]
+ RenderTableSection {TBODY} at (2,2) size 67x84
+ RenderTableRow {TR} at (0,0) size 67x21
+ RenderTableCell {TD} at (0,0) size 67x21 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 67x21
+ text run at (0,0) width 67: "All on the"
+ RenderTableRow {TR} at (0,21) size 67x21
+ RenderTableCell {TD} at (0,21) size 67x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 67x21
+ text run at (0,0) width 67: "All on the"
+ RenderTableRow {TR} at (0,42) size 67x21
+ RenderTableCell {TD} at (0,42) size 67x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 67x21
+ text run at (0,0) width 67: "All on the"
+ RenderTableRow {TR} at (0,63) size 67x21
+ RenderTableCell {TD} at (0,63) size 67x21 [r=3 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 67x21
+ text run at (0,0) width 67: "All on the"
+ RenderText {#text} at (227,170) size 4x21
+ text run at (227,170) width 4: " "
+ RenderTable {TABLE} at (231,163) size 81x88 [border: (2px solid #FF0000)]
+ RenderTableSection {TBODY} at (2,2) size 77x84
RenderTableRow {TR} at (0,0) size 77x21
RenderTableCell {TD} at (0,0) size 77x21 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (0,0) size 77x21
text run at (0,0) width 77: "same line. "
RenderTableRow {TR} at (0,21) size 77x21
RenderTableCell {TD} at (0,21) size 77x21 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 77x21
+ text run at (0,0) width 77: "same line. "
+ RenderTableRow {TR} at (0,42) size 77x21
+ RenderTableCell {TD} at (0,42) size 77x21 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (0,0) size 77x21
+ text run at (0,0) width 77: "same line. "
+ RenderTableRow {TR} at (0,63) size 77x21
+ RenderTableCell {TD} at (0,63) size 77x21 [r=3 c=0 rs=1 cs=1]
RenderText {#text} at (0,0) size 73x21
text run at (0,0) width 73: "same line."
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug2479-2-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug2479-2-expected.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug2479-2-expected.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug2479-2-expected.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x586
- RenderBlock {HTML} at (0,0) size 800x586 [bgcolor=#00FF99]
- RenderBody {BODY} at (57,64) size 686x458 [bgcolor=#99FFCC] [border: (3px solid #000000)]
+layer at (0,0) size 800x559
+ RenderBlock {HTML} at (0,0) size 800x559 [bgcolor=#00FF99]
+ RenderBody {BODY} at (57,64) size 686x431 [bgcolor=#99FFCC] [border: (3px solid #000000)]
RenderBlock {P} at (3,3) size 680x64
RenderText {#text} at (0,5) size 680x53
text run at (0,5) width 513: "These links are in an element with display table-row, and the li elements "
@@ -27,12 +27,12 @@
RenderInline {A} at (0,0) size 34x21 [color=#0000EE]
RenderText {#text} at (16,0) size 34x21
text run at (16,0) width 34: "links"
- RenderBlock {DIV} at (3,88) size 680x367
+ RenderBlock {DIV} at (3,88) size 680x340
RenderBlock (anonymous) at (16,16) size 648x21
RenderText {#text} at (0,0) size 434x21
text run at (0,0) width 188: "This text is not in the form. "
text run at (188,0) width 246: "The form should be indented 40px."
- RenderBlock {FORM} at (96,37) size 568x314
+ RenderBlock {FORM} at (96,37) size 568x287
RenderBlock {P} at (0,0) size 568x64
RenderText {#text} at (0,5) size 556x53
text run at (0,5) width 162: "This is text in the form. "
@@ -40,8 +40,8 @@
text run at (357,5) width 199: "The form itself has the same"
text run at (0,37) width 222: "table-row/table-cell problem as "
text run at (222,37) width 48: "above."
- RenderBlock {P} at (0,64) size 568x71
- RenderTable {SPAN} at (0,0) size 147x60
+ RenderBlock {P} at (0,64) size 568x62
+ RenderTable {SPAN} at (0,2) size 147x60
RenderTableSection (anonymous) at (0,0) size 147x60
RenderTableRow {SPAN} at (0,0) size 147x28
RenderTableCell (anonymous) at (0,0) size 147x28 [r=0 c=0 rs=1 cs=1]
@@ -50,9 +50,9 @@
RenderTableRow (anonymous) at (0,28) size 147x32
RenderTableCell (anonymous) at (0,28) size 147x32 [r=1 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (2,3) size 143x25
- RenderText {#text} at (147,44) size 4x21
- text run at (147,44) width 4: " "
- RenderTable {SPAN} at (151,0) size 147x60
+ RenderText {#text} at (147,5) size 4x21
+ text run at (147,5) width 4: " "
+ RenderTable {SPAN} at (151,2) size 147x60
RenderTableSection (anonymous) at (0,0) size 147x60
RenderTableRow {SPAN} at (0,0) size 147x28
RenderTableCell (anonymous) at (0,0) size 147x28 [r=0 c=0 rs=1 cs=1]
@@ -62,8 +62,8 @@
RenderTableCell (anonymous) at (0,28) size 147x32 [r=1 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (2,3) size 143x25
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,135) size 568x71
- RenderTable {SPAN} at (0,0) size 339x60
+ RenderBlock {P} at (0,126) size 568x62
+ RenderTable {SPAN} at (0,2) size 339x60
RenderTableSection (anonymous) at (0,0) size 339x60
RenderTableRow {SPAN} at (0,0) size 339x28
RenderTableCell (anonymous) at (0,0) size 339x28 [r=0 c=0 rs=1 cs=1]
@@ -73,8 +73,8 @@
RenderTableCell (anonymous) at (0,28) size 339x32 [r=1 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (2,3) size 335x25
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,206) size 568x71
- RenderTable {SPAN} at (0,0) size 147x60
+ RenderBlock {P} at (0,188) size 568x62
+ RenderTable {SPAN} at (0,2) size 147x60
RenderTableSection (anonymous) at (0,0) size 147x60
RenderTableRow {SPAN} at (0,0) size 147x28
RenderTableCell (anonymous) at (0,0) size 147x28 [r=0 c=0 rs=1 cs=1]
@@ -83,9 +83,9 @@
RenderTableRow (anonymous) at (0,28) size 147x32
RenderTableCell (anonymous) at (0,28) size 147x32 [r=1 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (2,3) size 143x25
- RenderText {#text} at (147,44) size 4x21
- text run at (147,44) width 4: " "
- RenderTable {SPAN} at (151,0) size 147x60
+ RenderText {#text} at (147,5) size 4x21
+ text run at (147,5) width 4: " "
+ RenderTable {SPAN} at (151,2) size 147x60
RenderTableSection (anonymous) at (0,0) size 147x60
RenderTableRow {SPAN} at (0,0) size 147x28
RenderTableCell (anonymous) at (0,0) size 147x28 [r=0 c=0 rs=1 cs=1]
@@ -95,7 +95,7 @@
RenderTableCell (anonymous) at (0,28) size 147x32 [r=1 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (2,3) size 143x25
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,277) size 568x37
+ RenderBlock {P} at (0,250) size 568x37
RenderButton {INPUT} at (2,2) size 66x33 [bgcolor=#C0C0C0]
RenderBlock (anonymous) at (6,6) size 54x21
RenderText at (0,0) size 54x21
@@ -107,13 +107,13 @@
RenderText at (0,0) size 80x21
text run at (0,0) width 80: "Clear Form"
RenderText {#text} at (0,0) size 0x0
-layer at (160,286) size 139x21
+layer at (160,288) size 139x21
RenderBlock {DIV} at (2,2) size 139x21
-layer at (311,286) size 139x21
+layer at (311,288) size 139x21
RenderBlock {DIV} at (2,2) size 139x21
-layer at (160,357) size 331x21
+layer at (160,350) size 331x21
RenderBlock {DIV} at (2,2) size 331x21
-layer at (160,428) size 139x21
+layer at (160,412) size 139x21
RenderBlock {DIV} at (2,2) size 139x21
-layer at (311,428) size 139x21
+layer at (311,412) size 139x21
RenderBlock {DIV} at (2,2) size 139x21
Modified: trunk/LayoutTests/platform/qt/test_expectations.txt (117405 => 117406)
--- trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-17 06:54:35 UTC (rev 117405)
+++ trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-17 07:07:23 UTC (rev 117406)
@@ -66,15 +66,5 @@
BUGWK86139 : ietestcenter/css3/namespaces/prefix-010.xml = IMAGE
BUGWK86142 : ietestcenter/css3/namespaces/syntax-021.xml = IMAGE
-// Rebaseline required after https://bugs.webkit.org/show_bug.cgi?id=84167
-BUGWK84167 : editing/pasteboard/innerText-inline-table.html = IMAGE+TEXT
-BUGWK84167 : editing/selection/iframe.html = IMAGE+TEXT
-BUGWK84167 : editing/selection/inline-table.html = IMAGE+TEXT
-BUGWK84167 : editing/selection/table-caret-3.html = IMAGE+TEXT
-BUGWK84167 : fast/css-generated-content/inline-display-types.html = IMAGE+TEXT
-BUGWK84167 : fast/css-generated-content/nested-tables-with-before-after-content-crash.html = IMAGE+TEXT
-BUGWK84167 : fast/inline-block/001.html = IMAGE+TEXT
-BUGWK84167 : tables/mozilla/bugs/bug2479-2.html = IMAGE+TEXT
-
// CSS Variables are not yet enabled.
BUGWK85580 SKIP : fast/css/variables = PASS FAIL
