summaryrefslogtreecommitdiffstats
path: root/ui/gfx/render_text.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 17:31:08 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 17:31:08 +0000
commita1a10599b20db4371f1e9c70035f6bb00bb7fc72 (patch)
treeea79ac2c5fd9ce72aaf2f7003ec00beabdd7b684 /ui/gfx/render_text.h
parentbb6baaba7ebacd655bf3dc4b3634b8b8cf070eac (diff)
downloadchromium_src-a1a10599b20db4371f1e9c70035f6bb00bb7fc72.zip
chromium_src-a1a10599b20db4371f1e9c70035f6bb00bb7fc72.tar.gz
chromium_src-a1a10599b20db4371f1e9c70035f6bb00bb7fc72.tar.bz2
Revert 113606 - 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. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113075 Review URL: http://codereview.chromium.org/8575020 TBR=asvitkine@chromium.org Review URL: http://codereview.chromium.org/8872024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text.h')
-rw-r--r--ui/gfx/render_text.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index a812210..da3607d 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -234,9 +234,6 @@ class UI_EXPORT RenderText {
virtual void DrawVisualText(Canvas* canvas) = 0;
// Get the logical index of the grapheme preceding the argument |position|.
- // If |IsCursorablePosition(position)| is true, the result will be the start
- // of the previous grapheme, if any. Otherwise, the result will be the start
- // of the grapheme containing |position|.
size_t GetIndexOfPreviousGrapheme(size_t position);
// Apply composition style (underline) to composition range and selection
@@ -255,13 +252,8 @@ class UI_EXPORT RenderText {
FRIEND_TEST_ALL_PREFIXES(RenderTextTest, CustomDefaultStyle);
FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyStyleRange);
FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StyleRangesAdjust);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SelectionModels);
// Return an index belonging to the |next| or previous logical grapheme.
- // If |next| is false and |IsCursorablePosition(index)| is true, the result
- // will be the start of the previous grapheme, if any. Otherwise, the result
- // will be the start of the grapheme containing |index|.
// The return value is bounded by 0 and the text length, inclusive.
virtual size_t IndexOfAdjacentGrapheme(size_t index, bool next) = 0;