diff options
7 files changed, 90 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.checksum new file mode 100644 index 0000000..e4e2317 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.checksum @@ -0,0 +1 @@ +3f48085d1e2b0726b4c2b85a83913d90
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.png Binary files differnew file mode 100644 index 0000000..c7b8678 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.txt new file mode 100644 index 0000000..d70e251 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/box-shadow/inset-expected.txt @@ -0,0 +1,42 @@ +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 {DIV} at (0,0) size 784x125 + RenderBlock {DIV} at (10,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (120,105) size 4x19 + text run at (120,105) width 4: " " + RenderBlock {DIV} at (134,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (244,105) size 4x19 + text run at (244,105) width 4: " " + RenderBlock {DIV} at (258,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (368,105) size 4x19 + text run at (368,105) width 4: " " + RenderBlock {DIV} at (382,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (492,105) size 4x19 + text run at (492,105) width 4: " " + RenderBlock {DIV} at (506,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,125) size 784x125 + RenderBlock {DIV} at (10,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (120,105) size 4x19 + text run at (120,105) width 4: " " + RenderBlock {DIV} at (134,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (244,105) size 4x19 + text run at (244,105) width 4: " " + RenderBlock {DIV} at (258,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (368,105) size 4x19 + text run at (368,105) width 4: " " + RenderBlock {DIV} at (382,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (492,105) size 4x19 + text run at (492,105) width 4: " " + RenderBlock {DIV} at (506,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px dashed #008000)] + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,250) size 600x324 + RenderInline {SPAN} at (0,0) size 586x307 [bgcolor=#FFFFE0] [border: (5px solid #008000)] + RenderText {#text} at (27,13) size 566x297 + text run at (27,13) width 566: "This sentence is too" + text run at (90,121) width 420: "long to fit on a" + text run at (133,229) width 313: "single line." + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.checksum new file mode 100644 index 0000000..157513c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.checksum @@ -0,0 +1 @@ +bd5c812368d58333ebfc75eca6b18cd0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.png Binary files differnew file mode 100644 index 0000000..ea5dd16 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.txt new file mode 100644 index 0000000..d70e251 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/inset-expected.txt @@ -0,0 +1,42 @@ +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 {DIV} at (0,0) size 784x125 + RenderBlock {DIV} at (10,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (120,105) size 4x19 + text run at (120,105) width 4: " " + RenderBlock {DIV} at (134,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (244,105) size 4x19 + text run at (244,105) width 4: " " + RenderBlock {DIV} at (258,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (368,105) size 4x19 + text run at (368,105) width 4: " " + RenderBlock {DIV} at (382,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (492,105) size 4x19 + text run at (492,105) width 4: " " + RenderBlock {DIV} at (506,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,125) size 784x125 + RenderBlock {DIV} at (10,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (120,105) size 4x19 + text run at (120,105) width 4: " " + RenderBlock {DIV} at (134,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (244,105) size 4x19 + text run at (244,105) width 4: " " + RenderBlock {DIV} at (258,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (368,105) size 4x19 + text run at (368,105) width 4: " " + RenderBlock {DIV} at (382,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px solid #008000)] + RenderText {#text} at (492,105) size 4x19 + text run at (492,105) width 4: " " + RenderBlock {DIV} at (506,10) size 100x100 [bgcolor=#FFFFE0] [border: (10px dashed #008000)] + RenderText {#text} at (0,0) size 0x0 + RenderBlock {DIV} at (0,250) size 600x324 + RenderInline {SPAN} at (0,0) size 586x307 [bgcolor=#FFFFE0] [border: (5px solid #008000)] + RenderText {#text} at (27,13) size 566x297 + text run at (27,13) width 566: "This sentence is too" + text run at (90,121) width 420: "long to fit on a" + text run at (133,229) width 313: "single line." + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 72fab79..dac20f6 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2994,11 +2994,11 @@ BUG17942 WIN LINUX : LayoutTests/traversal/acid3-test-2.html = CRASH PASS BUG17942 WIN : LayoutTests/fast/replaced/image-map-2.html = CRASH PASS BUG17942 LINUX : LayoutTests/transforms/2d/compound-2d-transforms.html = CRASH PASS BUG17942 LINUX : LayoutTests/fast/overflow/008.html = CRASH PASS -BUG17942 : LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect.html = FAIL -BUG17942 : LayoutTests/fast/dom/constructed-objects-prototypes.html = FAIL -BUG17942 : LayoutTests/fast/dom/prototype-inheritance-2.html = FAIL BUG17942 WIN DEBUG : LayoutTests/svg/dom/SVGScriptElement/script-load-and-error-events.svg = FAIL PASS -BUG17942 WIN LINUX : LayoutTests/fast/box-shadow/inset.html = FAIL +// New tests with this merge: +BUG17942 : LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect.html = FAIL +BUG18116 : LayoutTests/fast/dom/constructed-objects-prototypes.html = FAIL +BUG18116 : LayoutTests/fast/dom/prototype-inheritance-2.html = FAIL // Test failures from WebKit merge 46369 to 46426 BUG18016 WIN LINUX : LayoutTests/fast/canvas/image-pattern-rotate.html = FAIL |
