diff options
| author | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-23 16:16:29 +0000 |
|---|---|---|
| committer | jparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-23 16:16:29 +0000 |
| commit | 7e1b0740be7db1a28e5f3559339f2abbe9668763 (patch) | |
| tree | 3dd500934fb88341c3a26dea039929f6bf72658e | |
| parent | b22ed8d9d648192ebf58c3b5aee55bea76c36bfa (diff) | |
| download | chromium_src-7e1b0740be7db1a28e5f3559339f2abbe9668763.zip chromium_src-7e1b0740be7db1a28e5f3559339f2abbe9668763.tar.gz chromium_src-7e1b0740be7db1a28e5f3559339f2abbe9668763.tar.bz2 | |
Roll WebKit 60013:60046.
TBR=victorw
TEST=canaries
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48001 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "60013", + "webkit_revision": "60046", "ffmpeg_revision": "47712", "skia_revision": "562", "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 4475949..f84c74c 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -8,6 +8,4 @@ // temporarily mark these tests as failing until we can figure out why // r46500 (and wk 58765) seems to have caused a perf regression BUG43276 : fast/notifications/notifications-replace.html = FAIL -BUG43276 : fast/notifications/notifications-rtl.html = FAIL -// This test gets deleted at a later revision. -BUGJPARENT SKIP : inspector/arobens-test.html = TIMEOUT FAIL CRASH
\ No newline at end of file +BUG43276 : fast/notifications/notifications-rtl.html = FAIL
\ No newline at end of file |