diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 08:56:17 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 08:56:17 +0000 |
| commit | 76ae486cba7db7b2adada0716ccbbb846371363d (patch) | |
| tree | 17254c9ce33b257802f86f980dcb8e411819e494 | |
| parent | b5f94dea90a5c108a4c91876e53afaff34aef15b (diff) | |
| download | chromium_src-76ae486cba7db7b2adada0716ccbbb846371363d.zip chromium_src-76ae486cba7db7b2adada0716ccbbb846371363d.tar.gz chromium_src-76ae486cba7db7b2adada0716ccbbb846371363d.tar.bz2 | |
Roll webkit to 51681.
Updated expectations accordingly.
TBR=ajwong
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/462032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33806 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 19 |
2 files changed, 19 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "51642", + "webkit_revision": "51681", "ffmpeg_revision": "30374", "skia_revision": "450", "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 95566c3..9625bcd 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1386,7 +1386,7 @@ BUG10666 LINUX : chrome/fast/forms/basic-selects.html = FAIL // These tests are marked as failing on Linux because they depend on QuickTime. // See the bug for more discussion. BUG15797 LINUX : LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL -BUG15797 LINUX : LayoutTests/plugins/embed-attributes-setting.html = FAIL CRASH +BUG15797 LINUX : LayoutTests/plugins/embed-attributes-setting.html = PASS CRASH // Depends on plugin support. BUG10351 MAC : LayoutTests/fast/dom/object-embed-plugin-scripting.html = PASS FAIL @@ -3057,3 +3057,20 @@ BUG_ATWILSON MAC : LayoutTests/fast/borders/block-mask-overlay-image.html = FAIL BUG_ATWILSON : LayoutTests/fast/block/positioning/complex-percentage-height.html = FAIL BUG_ATWILSON : LayoutTests/fast/lists/item-not-in-list-line-wrapping.html = FAIL BUG_ATWILSON MAC : LayoutTests/fast/text/international/hindi-whitespace.html = FAIL + +// Failures from WebKit merge 51642:51681 +BUG_29393 : LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/document-destroyed-navigate-back.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-addeventlistener.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-attribute.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-body-inline-attribute.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/popstate-after-load-complete-window-attribute.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/pushstate-object-types.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/pushstate-then-replacestate.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/pushstate-with-fragment-urls-and-hashchange.html = TIMEOUT +BUG_29393 : LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.html = TIMEOUT + +BUG_ATWILSON : LayoutTests/accessibility/aria-scrollbar-role.html = TEXT +BUG_ATWILSON : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TEXT +BUG_ATWILSON LINUX WIN : LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html = IMAGE+TEXT +BUG_ATWILSON : LayoutTests/fast/repaint/selection-gap-overflow-scroll.html = IMAGE |