diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 07:00:33 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 07:00:33 +0000 |
| commit | e230ae4c0a49e32b20b6aec33b234252d0f8253b (patch) | |
| tree | 68fd3ee5d8074f84744fa786ceeb188661bd19e1 | |
| parent | f40401d1b6b1d40638499148a107656eda6deb0c (diff) | |
| download | chromium_src-e230ae4c0a49e32b20b6aec33b234252d0f8253b.zip chromium_src-e230ae4c0a49e32b20b6aec33b234252d0f8253b.tar.gz chromium_src-e230ae4c0a49e32b20b6aec33b234252d0f8253b.tar.bz2 | |
WebKit roll 68975:68995
BUG=none
TEST=none
TBR=hclam
Review URL: http://codereview.chromium.org/3535005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61349 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 20 |
2 files changed, 1 insertions, 21 deletions
@@ -4,7 +4,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "68975", + "webkit_revision": "68995", "skia_revision": "599", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3686d91..4c2310e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -5,23 +5,3 @@ // Only add expectations here to temporarily suppress messages on the bots // until the changes can be landed upstream. -// johnnyg to move upstream -BUGJOHNNYG WIN : fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html = TEXT PASS -BUGJOHNNYG LINUX : plugins/embed-attributes-style.html = IMAGE - -// To be upstreamed. -// Started failing in WebKit r68388:68412. -BUGSENORBLANCO WIN DEBUG : media/video-size.html = CRASH - -// Upstreamed; remove this on roll past r68543. -BUGSENORBLANCO WIN : platform/win/plugins/window-geometry-initialized-before-set-window.html = TEXT - -// Triggers a DCHECK in debug builds, so appears as a CRASH, -// produces TEXT differences in release builds. -BUGMICHAELN SKIP : http/tests/appcache/foreign-fallback.html = CRASH TEXT - -// Unexpected timeout in these tests. -BUG_HCLAM : http/tests/css/border-image-loading.html = TEXT TIMEOUT PASS -BUG_HCLAM : http/tests/css/css-image-loading.html = TEXT TIMEOUT PASS -BUG_HCLAM : http/tests/css/mask-image-loading.html = TEXT TIMEOUT PASS -BUG_HCLAM : http/tests/css/reflection-mask-image-loading.html = TEXT TIMEOUT PASS |