diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 22 |
2 files changed, 20 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "51253", + "webkit_revision": "51310", "ffmpeg_revision": "30374", "chromium_git": "http://src.chromium.org/git", } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ae6fbab..f3629b0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -665,9 +665,6 @@ BUG4360 : LayoutTests/storage/domstorage/documentURI.html = FAIL BUG4360 : LayoutTests/storage/domstorage/complex-values.html = FAIL BUG4360 : LayoutTests/http/tests/loading/deleted-host-in-resource-load-delegate-callback.html = TIMEOUT -// TODO(jorlow): Is this really still slow? If so, why? -BUG_JORLOW SLOW LINUX DEBUG : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = PASS - // HTML5 DB layout tests BUG27697 SKIP : LayoutTests/storage/hash-change-with-xhr.html = PASS // We do not use Safari's private browsing @@ -3036,3 +3033,22 @@ BUG28317 : LayoutTests/fast/css/color-correction-untagged-images.html = FAIL // Failures in TestShell that resulted from Mac plugin/focus fixes in r32631. BUG28380 MAC : LayoutTests/fast/events/tabindex-focus-blur-all.html = CRASH FAIL + +// Need rebase. Failures from merge 51253:51310. +BUG_JIANLI : LayoutTests/animations/keyframes-rule.html = TEXT + +// Local storage tests. Failures from merge 51253:51310. +BUG28603 : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-markup.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setattribute.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/localstorage/onstorage-attribute-setwindow.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/localstorage/simple-events.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/window-attributes-exist.html = TEXT +BUG28603 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT + +// New tests. Failures from merge 51253:51310. +BUG28605 : LayoutTests/plugins/reloadplugins-no-pages.html = TEXT +BUG28605 : LayoutTests/plugins/reloadplugins-and-pages.html = TIMEOUT +BUG28605 WIN LINUX : LayoutTests/svg/filters/big-sized-filter.svg = IMAGE +BUG28605 : LayoutTests/svg/filters/big-sized-filter-2.svg = MISSING +BUG28605 WIN LINUX : LayoutTests/svg/filters/filterRes.svg = IMAGE |