summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-23 04:36:33 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-23 04:36:33 +0000
commit11997c28f70473a82353ce033e0fd3dec3b2ac65 (patch)
treec448f047a82c428f94f16f97835b101c46e4f065
parente35d47d83d8a98b25ebd8eadc2ebeabbf7bb12ef (diff)
downloadchromium_src-11997c28f70473a82353ce033e0fd3dec3b2ac65.zip
chromium_src-11997c28f70473a82353ce033e0fd3dec3b2ac65.tar.gz
chromium_src-11997c28f70473a82353ce033e0fd3dec3b2ac65.tar.bz2
Roll webkit 59937:60013.
TBR=victorw TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47999 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index e0b556a..4660624 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "59937",
+ "webkit_revision": "60013",
"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 15273b9..8ce5ebe 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -9,3 +9,5 @@
// 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 : inspector/arobens-test.html = TIMEOUT \ No newline at end of file