summaryrefslogtreecommitdiffstats
path: root/ui/gfx/render_text.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 17:54:42 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 17:54:42 +0000
commit2da894c9f540654f4a169b1963974aadd187f260 (patch)
tree7dddfad4a78c6c05ee0797d281cea7d36eb8638d /ui/gfx/render_text.h
parentd3711cbf76f23cff553753bddfccf3956ba9ab75 (diff)
downloadchromium_src-2da894c9f540654f4a169b1963974aadd187f260.zip
chromium_src-2da894c9f540654f4a169b1963974aadd187f260.tar.gz
chromium_src-2da894c9f540654f4a169b1963974aadd187f260.tar.bz2
Revert 113635 (speculative revert for bug 107104)
- 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 TBR=asvitkine@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113956 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 681274a..38dfe31 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -264,9 +264,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
@@ -288,13 +285,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;