summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 22:20:19 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 22:20:19 +0000
commit671a2b632b69a43c3a7191647ab896b970f6aaee (patch)
treee9f1afaabe1b681fb4ca9781bc2a152e1af1425e
parentf6d33f3627cbb380773957fe14fcedc3b4087f53 (diff)
downloadchromium_src-671a2b632b69a43c3a7191647ab896b970f6aaee.zip
chromium_src-671a2b632b69a43c3a7191647ab896b970f6aaee.tar.gz
chromium_src-671a2b632b69a43c3a7191647ab896b970f6aaee.tar.bz2
TBR:WebKit roll 63323:63461.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52553 0039d316-1c4b-4281-b951-d872f2087c98
-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