diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 08:34:40 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 08:34:40 +0000 |
| commit | 5535c56b58b2ea4798ad6e84f0e3a686ba81c202 (patch) | |
| tree | e781a8e8d6ff3fc64987ce33f74a5353413f9d24 | |
| parent | dabcaf765ada7dc5d36c3f33e4363b2e9ac96bc8 (diff) | |
| download | chromium_src-5535c56b58b2ea4798ad6e84f0e3a686ba81c202.zip chromium_src-5535c56b58b2ea4798ad6e84f0e3a686ba81c202.tar.gz chromium_src-5535c56b58b2ea4798ad6e84f0e3a686ba81c202.tar.bz2 | |
WebKit roll 54016:54045.
Review URL: http://codereview.chromium.org/551202
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37503 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | app/gfx/text_elider_unittest.cc | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 6 |
3 files changed, 9 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "54016", + "webkit_revision": "54045", "ffmpeg_revision": "34297", "skia_revision": "475", "chromium_git": "http://src.chromium.org/git", diff --git a/app/gfx/text_elider_unittest.cc b/app/gfx/text_elider_unittest.cc index 385d92d..f8ef035 100644 --- a/app/gfx/text_elider_unittest.cc +++ b/app/gfx/text_elider_unittest.cc @@ -186,7 +186,8 @@ TEST(TextEliderTest, TestFilenameEliding) { } } -TEST(TextEliderTest, ElideTextLongStrings) { +// http://code.google.com/p/chromium/issues/detail?id=33489 +TEST(TextEliderTest, DISABLED_ElideTextLongStrings) { const std::wstring kEllipsisStr(kEllipsis); std::wstring data_scheme(L"data:text/plain,"); diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 5ff5e4c..206969b 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2915,3 +2915,9 @@ BUG33350 : fast/dom/location-hash.html = TEXT // WebKit roll 53941 -> 54015 BUG33359 WIN LINUX : fast/css/button-height.html = TEXT BUG33358 : fast/dom/Window/window-postmessage-clone-frames.html = TEXT + +// WebKit roll 54016 -> 54045 +BUG33486 WIN LINUX : fast/text/international/hebrew-vowels.html = IMAGE+TEXT +BUG33487 LINUX : fast/text/international/thai-baht-space.html = IMAGE +BUG33487 LINUX : fast/text/international/thai-line-breaks.html = IMAGE +BUG33488 LINUX : svg/text/text-intro-05-t.svg = IMAGE |