diff options
Diffstat (limited to 'webkit')
6 files changed, 4 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum index 14eeda3..94050bc 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum @@ -1 +1 @@ -64c463af201d791946a9bfc60306ca99
\ No newline at end of file +10fc62c032ce4576b177b76e054acd3c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png Binary files differindex 7b018cd..89e1b7ec 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum index ff15e84..83ca99b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.checksum @@ -1 +1 @@ -2645896d14b598b7764857ae6fb149e8
\ No newline at end of file +f53f3fc25798283f1447acb7eec20697
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png Binary files differindex ec15b67..51e2923 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt index f37135a..69e4e54 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt @@ -1,5 +1,5 @@ -layer at (0,0) size 802x600 - RenderView at (0,0) size 800x600 +layer at (0,0) size 802x585 + RenderView at (0,0) size 800x585 layer at (0,0) size 802x68 RenderBlock {HTML} at (0,0) size 800x68 RenderBody {BODY} at (8,24) size 784x20 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0546f55..31cb489 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2526,9 +2526,6 @@ BUG9798 : LayoutTests/media/video-src-invalid-remove.html = FAIL PASS // Regression from WebKit merge 43242:43321. BUG9798 LINUX : LayoutTests/transitions/mask-transitions.html = FAIL PASS -// Failed in WebKit merge 42287:42324 -BUG9916 WIN LINUX : LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html = FAIL - // New tests or failures from WebKit merge 42324:42364. Re-baselined on // Windows. Probably just need the same on other platforms. BUG9962 LINUX : LayoutTests/fast/block/positioning/fixed-positioning-scrollbar-bug.html = FAIL |
