diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 01:46:00 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 01:46:00 +0000 |
| commit | 9568f88337c93ea3f47b705c706e3c1e67aadc0f (patch) | |
| tree | 17ba15fca331cbd84800f4e7c058e1e44b44f7fc | |
| parent | 9628bcfe98951380642c5555c6331a87dce67792 (diff) | |
| download | chromium_src-9568f88337c93ea3f47b705c706e3c1e67aadc0f.zip chromium_src-9568f88337c93ea3f47b705c706e3c1e67aadc0f.tar.gz chromium_src-9568f88337c93ea3f47b705c706e3c1e67aadc0f.tar.bz2 | |
Revert "Take two at webkit merge 63323:63461."
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52588 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
2 files changed, 1 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "63461", + "webkit_revision": "63323", "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 2c045c2..1d6123c 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -101,6 +101,3 @@ 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 = CRASH TIMEOUT |