Diff
Modified: trunk/LayoutTests/ChangeLog (88134 => 88135)
--- trunk/LayoutTests/ChangeLog 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/LayoutTests/ChangeLog 2011-06-05 20:12:33 UTC (rev 88135)
@@ -1,3 +1,26 @@
+2011-06-05 Robert Hogan <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix and unskip acid2
+ https://bugs.webkit.org/show_bug.cgi?id=62089
+
+ We're unskipping acid2.html event though it's just a landing
+ page for the acid2 test. Some elements of the test are loaded by
+ the landing page so it is testing something, but acid2-pixel covers the same
+ ground.
+
+ * platform/qt/Skipped:
+ * platform/qt/fast/css/acid2-expected.txt: Updated
+ * platform/qt/fast/css/acid2-pixel-expected.png: Added.
+ * platform/qt/fast/css/acid2-pixel-expected.txt: Added.
+ * platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt: Removed.
+ * platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt: Removed.
+ * platform/qt/http/tests/misc/acid2-expected.png: Added.
+ * platform/qt/http/tests/misc/acid2-expected.txt: Added.
+ * platform/qt/http/tests/misc/acid2-pixel-expected.png: Added.
+ * platform/qt/http/tests/misc/acid2-pixel-expected.txt: Added
+
2011-06-05 Igor Oliveira <[email protected]>
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/LayoutTests/platform/qt/Skipped (88134 => 88135)
--- trunk/LayoutTests/platform/qt/Skipped 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-06-05 20:12:33 UTC (rev 88135)
@@ -283,8 +283,6 @@
# =========================================================================== #
# no expected results
-http/tests/misc/acid2-pixel.html
-http/tests/misc/acid2.html
http/tests/misc/favicon-as-image.html
# https://bugs.webkit.org/show_bug.cgi?id=34004
@@ -1311,7 +1309,6 @@
# -- fail with --platform mac --ignore-metrics
fast/box-sizing/percentage-height.html
-fast/css/acid2-pixel.html
fast/dom/focus-contenteditable.html
fast/dom/isindex-002.html
# seems to trigger some bugs/missing features in QTextCodec
Modified: trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt (88134 => 88135)
--- trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -58,13 +58,9 @@
layer at (84,2716) size 144x24
RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 144x0
- RenderInline {OBJECT} at (0,0) size 90x16
- RenderEmbeddedObject {OBJECT} at (54,0) size 90x30
- layer at (0,0) size 90x30
- RenderView at (0,0) size 90x30
- layer at (0,0) size 90x30
- RenderBlock {HTML} at (0,0) size 90x30
- RenderBody {BODY} at (8,8) size 74x14
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
layer at (84,2788) size 144x24
Added: trunk/LayoutTests/platform/qt/fast/css/acid2-pixel-expected.png
(Binary files differ)
Added: svn:mime-type
Copied: trunk/LayoutTests/platform/qt/fast/css/acid2-pixel-expected.txt (from rev 88134, trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt) (0 => 88135)
--- trunk/LayoutTests/platform/qt/fast/css/acid2-pixel-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/fast/css/acid2-pixel-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -0,0 +1,72 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x298
+ RenderBlock {HTML} at (0,0) size 800x298 [color=#FF0000] [bgcolor=#FFFFFF]
+ RenderBody {BODY} at (0,0) size 800x298
+ RenderBlock {H2} at (72,0) size 656x72 [color=#000080]
+ RenderText {#text} at (12,45) size 129x30
+ text run at (12,45) width 129: "Hello World!"
+layer at (36,72) size 764x226
+ RenderBlock (relative positioned) {DIV} at (36,72) size 764x226 [border: (12px solid #00000000)]
+ RenderTable {TABLE} at (12,12) size 1x0
+ RenderTableSection {TBODY} at (0,0) size 1x0
+ RenderTableRow {TR} at (0,0) size 1x0
+ RenderTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (60,60) size 120x12 [bgcolor=#FF0000] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x12
+ RenderText {#text} at (0,-2) size 90x16
+ text run at (0,-2) width 90: " "
+ RenderBlock (floating) {DIV} at (36,96) size 168x48 [border: none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x48 [bgcolor=#FFFF00]
+ RenderBlock {DIV} at (60,12) size 24x24 [bgcolor=#FF0000]
+ RenderBlock (generated) at (0,0) size 24x12 [border: none (12px solid #FFFF00) (12px solid #000000) (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock (generated) at (0,12) size 24x12 [border: (12px solid #000000) (12px solid #FFFF00) none (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock {DIV} at (87,75) size 590x0
+ RenderBlock {DIV} at (48,0) size 518x0
+ RenderBlock {DIV} at (48,132) size 668x24
+ RenderBlock {DIV} at (60,168) size 120x12 [bgcolor=#FFFF00] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderInline {DIV} at (0,0) size 1x3
+ RenderText {#text} at (12,8) size 1x3
+ text run at (12,8) width 1: " "
+ RenderBlock {DIV} at (12,180) size 740x12
+ RenderBlock {DIV} at (60,0) size 96x12 [color=#FFA500] [bgcolor=#FFFF00] [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderTable {UL} at (96,192) size 48x12 [bgcolor=#FF0000]
+ RenderTableSection (anonymous) at (0,0) size 48x12
+ RenderTableRow (anonymous) at (0,0) size 48x12
+ RenderTableCell {LI} at (0,0) size 12x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell (anonymous) at (12,0) size 12x12 [r=0 c=1 rs=1 cs=1]
+ RenderTable {LI} at (0,0) size 12x12 [bgcolor=#000000]
+ RenderTableCell {LI} at (24,0) size 12x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell (anonymous) at (36,0) size 12x12 [r=0 c=3 rs=1 cs=1]
+ RenderListItem {LI} at (0,0) size 12x12 [bgcolor=#000000]
+layer at (48,276) size 740x10 scrollHeight 313
+ RenderBlock {DIV} at (12,204) size 740x10
+ RenderTable {TABLE} at (0,0) size 64x313
+ RenderTableSection {TBODY} at (0,0) size 64x313
+ RenderTableRow {TR} at (0,0) size 64x313
+ RenderTableCell {TD} at (0,0) size 64x313 [r=0 c=0 rs=1 cs=1]
+ RenderImage {IMG} at (0,167) size 64x64
+layer at (132,108) size 48x18
+ RenderBlock (positioned) {P} at (132,108) size 48x18 [bgcolor=#000000] [border: none (6px solid #FFFF00) none]
+layer at (132,144) size 48x15
+ RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
+layer at (108,120) size 96x12
+ RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
+layer at (84,144) size 144x24
+ RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 144x0
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
+ RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
+ RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
+layer at (84,216) size 144x24
+ RenderBlock (relative positioned) {DIV} at (0,0) size 144x24 [bgcolor=#000000]
+layer at (96,216) size 120x24
+ RenderBlock (positioned) {DIV} at (12,0) size 120x24 [border: (12px solid #FFFF00)]
+ RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
+ RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
+ RenderBlock {STRONG} at (0,12) size 72x0
Deleted: trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt (88134 => 88135)
--- trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -1,2 +0,0 @@
-PASS
-
Deleted: trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt (88134 => 88135)
--- trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/LayoutTests/platform/qt/fast/overflow/overflow-height-float-not-removed-crash3-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -1,2 +0,0 @@
-Test passes if it does not crash.
-
Added: trunk/LayoutTests/platform/qt/http/tests/misc/acid2-expected.png
(Binary files differ)
Added: svn:mime-type
Copied: trunk/LayoutTests/platform/qt/http/tests/misc/acid2-expected.txt (from rev 88134, trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt) (0 => 88135)
--- trunk/LayoutTests/platform/qt/http/tests/misc/acid2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/http/tests/misc/acid2-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -0,0 +1,88 @@
+layer at (0,0) size 800x4070
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x4070
+ RenderBlock {HTML} at (0,0) size 800x4070 [color=#FF0000] [bgcolor=#FFFFFF]
+ RenderBody {BODY} at (0,84) size 800x2786
+ RenderBlock {H2} at (72,2488) size 656x72 [color=#000080]
+ RenderText {#text} at (12,45) size 129x30
+ text run at (12,45) width 129: "Hello World!"
+layer at (36,2644) size 764x226
+ RenderBlock (relative positioned) {DIV} at (36,2560) size 764x226 [border: (12px solid #00000000)]
+ RenderTable {TABLE} at (12,12) size 1x0
+ RenderTableSection {TBODY} at (0,0) size 1x0
+ RenderTableRow {TR} at (0,0) size 1x0
+ RenderTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (60,60) size 120x12 [bgcolor=#FF0000] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x12
+ RenderText {#text} at (0,-2) size 90x16
+ text run at (0,-2) width 90: " "
+ RenderBlock (floating) {DIV} at (36,96) size 168x48 [border: none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x48 [bgcolor=#FFFF00]
+ RenderBlock {DIV} at (60,12) size 24x24 [bgcolor=#FF0000]
+ RenderBlock (generated) at (0,0) size 24x12 [border: none (12px solid #FFFF00) (12px solid #000000) (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock (generated) at (0,12) size 24x12 [border: (12px solid #000000) (12px solid #FFFF00) none (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock {DIV} at (87,75) size 590x0
+ RenderBlock {DIV} at (48,0) size 518x0
+ RenderBlock {DIV} at (48,132) size 668x24
+ RenderBlock {DIV} at (60,168) size 120x12 [bgcolor=#FFFF00] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderInline {DIV} at (0,0) size 1x3
+ RenderText {#text} at (12,8) size 1x3
+ text run at (12,8) width 1: " "
+ RenderBlock {DIV} at (12,180) size 740x12
+ RenderBlock {DIV} at (60,0) size 96x12 [color=#FFA500] [bgcolor=#FFFF00] [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderTable {UL} at (96,192) size 48x12 [bgcolor=#FF0000]
+ RenderTableSection (anonymous) at (0,0) size 48x12
+ RenderTableRow (anonymous) at (0,0) size 48x12
+ RenderTableCell {LI} at (0,0) size 12x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell (anonymous) at (12,0) size 12x12 [r=0 c=1 rs=1 cs=1]
+ RenderTable {LI} at (0,0) size 12x12 [bgcolor=#000000]
+ RenderTableCell {LI} at (24,0) size 12x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell (anonymous) at (36,0) size 12x12 [r=0 c=3 rs=1 cs=1]
+ RenderListItem {LI} at (0,0) size 12x12 [bgcolor=#000000]
+layer at (48,2848) size 740x10 scrollHeight 313
+ RenderBlock {DIV} at (12,204) size 740x10
+ RenderTable {TABLE} at (0,0) size 64x313
+ RenderTableSection {TBODY} at (0,0) size 64x313
+ RenderTableRow {TR} at (0,0) size 64x313
+ RenderTableCell {TD} at (0,0) size 64x313 [r=0 c=0 rs=1 cs=1]
+ RenderImage {IMG} at (0,167) size 64x64
+layer at (132,108) size 48x18
+ RenderBlock (positioned) {P} at (132,108) size 48x18 [bgcolor=#000000] [border: none (6px solid #FFFF00) none]
+layer at (132,144) size 48x15
+ RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
+layer at (108,2692) size 96x12
+ RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
+layer at (84,2716) size 144x24
+ RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 144x0
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
+ RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
+ RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
+layer at (84,2788) size 144x24
+ RenderBlock (relative positioned) {DIV} at (0,0) size 144x24 [bgcolor=#000000]
+layer at (96,2788) size 120x24
+ RenderBlock (positioned) {DIV} at (12,0) size 120x24 [border: (12px solid #FFFF00)]
+ RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
+ RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
+ RenderBlock {STRONG} at (0,12) size 72x0
+layer at (48,84) size 704x88
+ RenderBlock (relative positioned) zI: 2 {DIV} at (48,0) size 704x88 [color=#000000] [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+ RenderBlock {H1} at (13,13) size 678x32
+ RenderText {#text} at (0,0) size 253x32
+ text run at (0,0) width 253: "Standards compliant?"
+ RenderBlock {P} at (13,45) size 678x30
+ RenderInline {A} at (0,0) size 221x30 [color=#0000FF]
+ RenderText {#text} at (0,0) size 221x30
+ text run at (0,0) width 221: "Take The Acid2 Test"
+ RenderText {#text} at (221,0) size 198x30
+ text run at (221,0) width 198: " and compare it to "
+ RenderInline {A} at (0,0) size 246x30 [color=#0000FF]
+ RenderText {#text} at (419,0) size 246x30
+ text run at (419,0) width 246: "the reference rendering"
+ RenderText {#text} at (665,0) size 7x30
+ text run at (665,0) width 7: "."
Added: trunk/LayoutTests/platform/qt/http/tests/misc/acid2-pixel-expected.png
(Binary files differ)
Added: svn:mime-type
Copied: trunk/LayoutTests/platform/qt/http/tests/misc/acid2-pixel-expected.txt (from rev 88134, trunk/LayoutTests/platform/qt/fast/css/acid2-expected.txt) (0 => 88135)
--- trunk/LayoutTests/platform/qt/http/tests/misc/acid2-pixel-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/http/tests/misc/acid2-pixel-expected.txt 2011-06-05 20:12:33 UTC (rev 88135)
@@ -0,0 +1,72 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x298
+ RenderBlock {HTML} at (0,0) size 800x298 [color=#FF0000] [bgcolor=#FFFFFF]
+ RenderBody {BODY} at (0,0) size 800x298
+ RenderBlock {H2} at (72,0) size 656x72 [color=#000080]
+ RenderText {#text} at (12,45) size 129x30
+ text run at (12,45) width 129: "Hello World!"
+layer at (36,72) size 764x226
+ RenderBlock (relative positioned) {DIV} at (36,72) size 764x226 [border: (12px solid #00000000)]
+ RenderTable {TABLE} at (12,12) size 1x0
+ RenderTableSection {TBODY} at (0,0) size 1x0
+ RenderTableRow {TR} at (0,0) size 1x0
+ RenderTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (60,60) size 120x12 [bgcolor=#FF0000] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x12
+ RenderText {#text} at (0,-2) size 90x16
+ text run at (0,-2) width 90: " "
+ RenderBlock (floating) {DIV} at (36,96) size 168x48 [border: none (12px solid #000000)]
+ RenderBlock {DIV} at (12,0) size 144x48 [bgcolor=#FFFF00]
+ RenderBlock {DIV} at (60,12) size 24x24 [bgcolor=#FF0000]
+ RenderBlock (generated) at (0,0) size 24x12 [border: none (12px solid #FFFF00) (12px solid #000000) (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock (generated) at (0,12) size 24x12 [border: (12px solid #000000) (12px solid #FFFF00) none (12px solid #FFFF00)]
+ RenderText at (0,0) size 0x0
+ RenderBlock {DIV} at (87,75) size 590x0
+ RenderBlock {DIV} at (48,0) size 518x0
+ RenderBlock {DIV} at (48,132) size 668x24
+ RenderBlock {DIV} at (60,168) size 120x12 [bgcolor=#FFFF00] [border: (12px solid #000000) none (12px solid #000000)]
+ RenderInline {DIV} at (0,0) size 1x3
+ RenderText {#text} at (12,8) size 1x3
+ text run at (12,8) width 1: " "
+ RenderBlock {DIV} at (12,180) size 740x12
+ RenderBlock {DIV} at (60,0) size 96x12 [color=#FFA500] [bgcolor=#FFFF00] [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderTable {UL} at (96,192) size 48x12 [bgcolor=#FF0000]
+ RenderTableSection (anonymous) at (0,0) size 48x12
+ RenderTableRow (anonymous) at (0,0) size 48x12
+ RenderTableCell {LI} at (0,0) size 12x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell (anonymous) at (12,0) size 12x12 [r=0 c=1 rs=1 cs=1]
+ RenderTable {LI} at (0,0) size 12x12 [bgcolor=#000000]
+ RenderTableCell {LI} at (24,0) size 12x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell (anonymous) at (36,0) size 12x12 [r=0 c=3 rs=1 cs=1]
+ RenderListItem {LI} at (0,0) size 12x12 [bgcolor=#000000]
+layer at (48,276) size 740x10 scrollHeight 313
+ RenderBlock {DIV} at (12,204) size 740x10
+ RenderTable {TABLE} at (0,0) size 64x313
+ RenderTableSection {TBODY} at (0,0) size 64x313
+ RenderTableRow {TR} at (0,0) size 64x313
+ RenderTableCell {TD} at (0,0) size 64x313 [r=0 c=0 rs=1 cs=1]
+ RenderImage {IMG} at (0,167) size 64x64
+layer at (132,108) size 48x18
+ RenderBlock (positioned) {P} at (132,108) size 48x18 [bgcolor=#000000] [border: none (6px solid #FFFF00) none]
+layer at (132,144) size 48x15
+ RenderBlock (positioned) {P} at (132,144) size 48x15 [bgcolor=#000000] [border: none (3px solid #FF0000) none]
+layer at (108,120) size 96x12
+ RenderBlock (positioned) {BLOCKQUOTE} at (72,48) size 96x12 [border: none (24px solid #000000) none (24px solid #000000)]
+ RenderBlock (floating) {ADDRESS} at (24,0) size 48x12 [bgcolor=#FFFF00]
+layer at (84,144) size 144x24
+ RenderBlock (positioned) {DIV} at (48,72) size 144x24 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 144x0
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderInline {OBJECT} at (0,0) size 131x16
+ RenderImage {OBJECT} at (13,0) size 131x24 [border: (12px solid #000000) none]
+ RenderBlock (floating) {DIV} at (0,0) size 144x24 [border: (12px solid #FF0000) none (12px solid #000000)]
+ RenderBlock {DIV} at (0,0) size 144x24 [border: (24px solid #FFFF00)]
+layer at (84,216) size 144x24
+ RenderBlock (relative positioned) {DIV} at (0,0) size 144x24 [bgcolor=#000000]
+layer at (96,216) size 120x24
+ RenderBlock (positioned) {DIV} at (12,0) size 120x24 [border: (12px solid #FFFF00)]
+ RenderBlock (floating) {SPAN} at (12,0) size 96x12 [border: none (12px solid #00000000) none (12px solid #00000000)]
+ RenderBlock (floating) {EM} at (12,0) size 72x24 [border: (12px solid #FFFF00) none (12px solid #000000) none]
+ RenderBlock {STRONG} at (0,12) size 72x0
Modified: trunk/Source/WebKit/qt/ChangeLog (88134 => 88135)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-05 20:12:33 UTC (rev 88135)
@@ -1,3 +1,27 @@
+2011-06-04 Robert Hogan <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix and unskip acid2
+ https://bugs.webkit.org/show_bug.cgi?id=62089
+
+ shouldFallBack() tells the DOM if it should attempt to render
+ the next nested <object> if its parent fails to load.
+
+ This fix is only required for the fast/css version of the ACID2
+ test, which loads a non-existent file:// url. The HTTP version of the
+ test already passes because the loader will render fallback content
+ on a failed HTTP load without delegating the decision to the client
+ ( see MainResourceLoader::continueAfterContentPolicy).
+
+ Some ports also check for WebKitErrorPluginWillHandleLoad when deciding
+ what to return. This error isn't currently set by Qt so we don't check
+ it. (Other ports set it when the erring document is a MediaDocument, maybe
+ we should do that too at some point).
+
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::shouldFallBack):
+
2011-06-03 Rafael Brandao <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (88134 => 88135)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-06-05 18:34:07 UTC (rev 88134)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-06-05 20:12:33 UTC (rev 88135)
@@ -987,10 +987,9 @@
QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
}
-bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&)
+bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
{
- notImplemented();
- return false;
+ return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange));
}
WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientQt::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
