From 2916b4038bb7f3ca203f32039145bc8cdd3bf735 Mon Sep 17 00:00:00 2001 From: "asvitkine@chromium.org" Date: Thu, 8 Dec 2011 18:58:27 +0000 Subject: Improve RenderTextWin font fallback. Don't use SCRIPT_UNDEFINED in the case of font fallback, unless font fallback actually fails to return a script that can display the characters. This fixes the problem of some scripts not being properly displayed. This actually makes RenderTextWin properly validate whether a text position accepts a cursor, which caused several tests to fail and revealed some additional issues in RenderTextWin. The CL includes some modifications to address this. Some tests are disabled under XP, see: http://crbug.com/106450 Also, fixes some lint warnings. BUG=90426 TEST=Run chrome.exe --use-pure-views and paste some Bengali text into the omnibox. It should show up properly. Review URL: http://codereview.chromium.org/8575020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113635 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/render_text_linux.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui/gfx/render_text_linux.cc') diff --git a/ui/gfx/render_text_linux.cc b/ui/gfx/render_text_linux.cc index e2f0d67..2777006 100644 --- a/ui/gfx/render_text_linux.cc +++ b/ui/gfx/render_text_linux.cc @@ -284,6 +284,8 @@ void RenderTextLinux::DrawVisualText(Canvas* canvas) { } size_t RenderTextLinux::IndexOfAdjacentGrapheme(size_t index, bool next) { + if (index > text().length()) + return text().length(); EnsureLayout(); return Utf16IndexOfAdjacentGrapheme(Utf16IndexToUtf8Index(index), next); } -- cgit v1.1