diff options
| -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 | 9 |
3 files changed, 8 insertions, 6 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "54045", + "webkit_revision": "54059", "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 f8ef035..385d92d 100644 --- a/app/gfx/text_elider_unittest.cc +++ b/app/gfx/text_elider_unittest.cc @@ -186,8 +186,7 @@ TEST(TextEliderTest, TestFilenameEliding) { } } -// http://code.google.com/p/chromium/issues/detail?id=33489 -TEST(TextEliderTest, DISABLED_ElideTextLongStrings) { +TEST(TextEliderTest, 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 206969b..ca2eecc 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2918,6 +2918,9 @@ 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 +BUG33486 LINUX : fast/text/international/thai-baht-space.html = IMAGE +BUG33486 LINUX : fast/text/international/thai-line-breaks.html = IMAGE +BUG33486 LINUX : svg/text/text-intro-05-t.svg = IMAGE + +// WebKit roll 54045 -> 54059 +BUG33497 : storage/domstorage/sessionstorage/window-open.html = TEXT |