diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 23:47:14 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 23:47:14 +0000 |
| commit | b3256f18baa2a63cb0b6da721900f8975e8587ae (patch) | |
| tree | df39ae06a253dd4f5de0f4b677133142e267b233 | |
| parent | f07aeda26e96052469914564ee3eca1b837654d0 (diff) | |
| download | chromium_src-b3256f18baa2a63cb0b6da721900f8975e8587ae.zip chromium_src-b3256f18baa2a63cb0b6da721900f8975e8587ae.tar.gz chromium_src-b3256f18baa2a63cb0b6da721900f8975e8587ae.tar.bz2 | |
WebKit roll 51102:51135.
BUG=10342
TEST=none
Review URL: http://codereview.chromium.org/399091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32435 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "51102", + "webkit_revision": "51135", "ffmpeg_revision": "30374", "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 5909faf..2d0c104 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1342,7 +1342,7 @@ BUG10341 LINUX : LayoutTests/fast/lists/001.html = FAIL // We fail to load a file URL with a port number -- how does this work on // Windows? -BUG10342 LINUX MAC : LayoutTests/fast/loader/file-URL-with-port-number.html = TEXT +BUG10342 LINUX MAC : LayoutTests/fast/loader/file-URL-with-port-number.html = TIMEOUT // Text doesn't display at all -- maybe we don't have the slow font // code enabled? |