diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 02:54:35 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 02:54:35 +0000 |
| commit | c1e079c2480aadd526a4ed85f790452436e2551b (patch) | |
| tree | d1df6f46d7fd7966906499080c221fa1a29e3324 | |
| parent | ca88ea4ddf7ad2d5083868e0d2ac728c2025e945 (diff) | |
| download | chromium_src-c1e079c2480aadd526a4ed85f790452436e2551b.zip chromium_src-c1e079c2480aadd526a4ed85f790452436e2551b.tar.gz chromium_src-c1e079c2480aadd526a4ed85f790452436e2551b.tar.bz2 | |
Update WebKit to r60649. Remove temporary override in test_expectations.
BUG=none
TEST=none
TBR=tkent
Review URL: http://codereview.chromium.org/2628001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48901 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
2 files changed, 1 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "60630", + "webkit_revision": "60649", "ffmpeg_revision": "48686", "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 14f1f6a..ca3efc2 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -8,7 +8,3 @@ // temporarily enable these tests downstream until they're fully upstreamed. BUG11246 : fast/dom/Geolocation = PASS BUG11246 DEFER SKIP : fast/dom/Geolocation/callback-exception.html = TEXT - -// Fix is already in upstream, as soon as WK is rolled past r60643, remove -// this exception. -BUGJOHNNYG : fast/notifications/notifications-display-close-events.html = TEXT |