diff options
| author | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 14:41:32 +0000 |
|---|---|---|
| committer | ckocagil@chromium.org <ckocagil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 14:41:32 +0000 |
| commit | 35fef9f397e8257e9a365400acbd81a4546719eb (patch) | |
| tree | 2bee7b3883c537033e4b06892396bd4ecdc91885 /ui/gfx | |
| parent | 23f32ab7eaed5427380eca0ab46c70f4954ed591 (diff) | |
| download | chromium_src-35fef9f397e8257e9a365400acbd81a4546719eb.zip chromium_src-35fef9f397e8257e9a365400acbd81a4546719eb.tar.gz chromium_src-35fef9f397e8257e9a365400acbd81a4546719eb.tar.bz2 | |
Fix and re-enable RenderTextTest.Multiline_NormalWidth on XP
BUG=248597
TBR=asvitkine@chromium.org
Review URL: https://codereview.chromium.org/26358015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
| -rw-r--r-- | ui/gfx/render_text_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc index 1cc81de..75e985e 100644 --- a/ui/gfx/render_text_unittest.cc +++ b/ui/gfx/render_text_unittest.cc @@ -1676,19 +1676,13 @@ TEST_F(RenderTextTest, Multiline_MinWidth) { // Ensure strings wrap onto multiple lines for a normal available width. TEST_F(RenderTextTest, Multiline_NormalWidth) { - // TODO(ckocagil): Enable this test on XP. -#if defined(OS_WIN) - if (base::win::GetVersion() < base::win::VERSION_VISTA) - return; -#endif - const struct { const wchar_t* const text; const Range first_line_char_range; const Range second_line_char_range; } kTestStrings[] = { { L"abc defg hijkl", Range(0, 9), Range(9, 14) }, - { L"qwertyuiop", Range(0, 8), Range(8, 10) }, + { L"qwertyzxcvbn", Range(0, 8), Range(8, 12) }, { L"\x062A\x0641\x0627\x062D\x05EA\x05E4\x05D5\x05D6\x05D9\x05DD", Range(4, 10), Range(0, 4) } }; |