diff options
3 files changed, 36 insertions, 39 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/relative-overflow-block-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/relative-overflow-block-expected.txt index 7e81075..9da6bd9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/relative-overflow-block-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/relative-overflow-block-expected.txt @@ -6,7 +6,7 @@ layer at (0,0) size 785x585 RenderText {#text} at (0,0) size 757x39 text run at (0,0) width 757: "Document canvas should be big enough to fit both blue and red (relative positioned) rectangles (ie. have scrollbars if they don't" text run at (0,20) width 90: "fit to the view) " -layer at (8,48) size 506x506 +layer at (8,48) size 504x506 RenderBlock (positioned) {DIV} at (8,48) size 504x504 [border: (2px solid #0000FF)] layer at (310,350) size 504x504 RenderBlock (relative positioned) {DIV} at (2,2) size 504x504 [border: (2px solid #FF0000)] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transforms-with-opacity-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transforms-with-opacity-expected.txt index c3d6235..a88cdac 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transforms-with-opacity-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/transforms/transforms-with-opacity-expected.txt @@ -6,9 +6,9 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (0,0) size 784x20 RenderText {#text} at (0,0) size 714x19 text run at (0,0) width 714: "In the example below you should see three blocks right next to one another, and they should all be partially transparent." -layer at (8,28) size 140x130 +layer at (8,28) size 120x130 RenderBlock {DIV} at (0,20) size 120x120 [bgcolor=#87CEEB] [border: (10px solid #000000)] -layer at (18,38) size 130x130 +layer at (18,38) size 120x130 RenderBlock {DIV} at (10,10) size 120x120 [border: (10px solid #000000)] layer at (28,48) size 120x120 RenderBlock {DIV} at (10,10) size 120x120 [border: (10px solid #000000)] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index f22a4ab..6577b28 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2350,59 +2350,56 @@ DEFER MAC LINUX : LayoutTests/fast/backgrounds/svg-as-background-4.html = FAIL // Merge WebKit: 42026:42115 regressions // BUG: 9581 -LayoutTests/fast/block/positioning/002.html = FAIL -LayoutTests/fast/block/positioning/relative-overflow-block.html = FAIL -LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html = FAIL -LayoutTests/fast/forms/mailto/get-multiple-items.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/get-non-ascii.html = FAIL -LayoutTests/fast/forms/mailto/get-overwrite-query.html = FAIL -LayoutTests/fast/forms/mailto/post-append-query.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html = FAIL -LayoutTests/fast/forms/mailto/post-multiple-items.html = FAIL -LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html = FAIL -LayoutTests/fast/forms/mailto/post-text-plain.html = FAIL -LayoutTests/fast/transforms/transforms-with-opacity.html = FAIL WIN : LayoutTests/http/tests/navigation/error404-goback.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/javascriptlink-goback.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/metaredirect-goback.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/post-basic.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/post-frames.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/post-basic.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/post-frames.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/post-goback2.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/postredirect-basic.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/postredirect-frames.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/postredirect-goback1.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/postredirect-basic.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/postredirect-frames.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/postredirect-goback1.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/postredirect-goback2.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/redirect302-goback.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-frames.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-goback.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/restore-form-state-https.html = FAIL +WIN MAC LINUX : LayoutTests/http/tests/navigation/restore-form-state-https.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/success200-frames-loadsame.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/success200-goback.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/success200-loadsame.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/success200-reload.html = FAIL WIN LINUX : LayoutTests/http/tests/navigation/timerredirect-goback.html = FAIL -WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT -LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT -MAC : LayoutTests/http/tests/navigation/post-basic.html = FAIL -MAC : LayoutTests/http/tests/navigation/post-frames.html = FAIL -MAC : LayoutTests/http/tests/navigation/postredirect-basic.html = FAIL -MAC : LayoutTests/http/tests/navigation/postredirect-frames.html = FAIL -MAC : LayoutTests/http/tests/navigation/postredirect-goback1.html = FAIL -MAC : LayoutTests/http/tests/navigation/restore-form-state-https.html = FAIL -MAC : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL -MAC : LayoutTests/svg/text/text-intro-05-t.svg = FAIL WIN : LayoutTests/editing/execCommand/paste-2.html = FAIL WIN : LayoutTests/editing/selection/4776665.html = FAIL -WIN : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT PASS CRASH + +// Changed in http://trac.webkit.org/changeset/42063 +MAC : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL +MAC : LayoutTests/svg/text/text-intro-05-t.svg = FAIL + +// Changed in http://trac.webkit.org/changeset/42082 +WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT +LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT + +// Implement layoutTestController.waitForPolicyDelegate +// BUG: 9595 +LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL +LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html = FAIL +LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html = FAIL +LayoutTests/fast/forms/mailto/get-multiple-items.html = FAIL +LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html = FAIL +LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html = FAIL +LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html = FAIL +LayoutTests/fast/forms/mailto/get-non-ascii.html = FAIL +LayoutTests/fast/forms/mailto/get-overwrite-query.html = FAIL +LayoutTests/fast/forms/mailto/post-append-query.html = FAIL +LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html = FAIL +LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html = FAIL +LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html = FAIL +LayoutTests/fast/forms/mailto/post-multiple-items.html = FAIL +LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html = FAIL +LayoutTests/fast/forms/mailto/post-text-plain.html = FAIL // Merge WebKit: 42026:42115 new tests DEFER : LayoutTests/fast/block/positioning/negative-rel-position.html = FAIL |