summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 8aa6c83..b87f4fcf 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "63323",
+ "webkit_revision": "63461",
"ffmpeg_revision": "49485",
"skia_revision": "583",
"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 1d6123c..53222c3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -101,3 +101,6 @@ BUG_PODIVILOV MAC : svg/custom/clip-path-child-changes.svg = TEXT
// TODO(ager): started crashing after the v8 roll of r52309.
// http://crbug.com/49099
BUG_AGER LINUX DEBUG : fast/js/excessive-comma-usage.html = CRASH
+
+// TODO(johhnyg): Fix this
+BUG_JOHNNYG : fast/forms/input-file-directory-upload.html = TIMEOUT