Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Unified Diff: ui/gfx/render_text.h

Issue 263833010: Revert of Fix Views inline autocomplete with multi-char graphemes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/render_text.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 19c118abc916928f7512ba957a71b64314004b94..93054b4487a76c1e16eeaebccb655b747aedcd49 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -378,13 +378,9 @@
// Gets the SelectionModel from a visual point in local coordinates.
virtual SelectionModel FindCursorPosition(const Point& point) = 0;
- // Returns true if the position is a valid logical index into text(), and is
- // also a valid grapheme boundary, which may be used as a cursor position.
- virtual bool IsValidCursorIndex(size_t index) = 0;
-
- // Returns true if the position is a valid logical index into text(). Indices
- // amid multi-character graphemes are allowed here, unlike IsValidCursorIndex.
- virtual bool IsValidLogicalIndex(size_t index);
+ // Return true if cursor can appear in front of the character at |position|,
+ // which means it is a grapheme boundary or the first character in the text.
+ virtual bool IsCursorablePosition(size_t position) = 0;
// Get the visual bounds of a cursor at |caret|. These bounds typically
// represent a vertical line if |insert_mode| is true. Pass false for
@@ -392,7 +388,8 @@
// are in local coordinates, but may be outside the visible region if the text
// is longer than the textfield. Subsequent text, cursor, or bounds changes
// may invalidate returned values. Note that |caret| must be placed at
- // grapheme boundary, i.e. caret.caret_pos() must be a cursorable position.
+ // grapheme boundary, that is, |IsCursorablePosition(caret.caret_pos())| must
+ // return true.
Rect GetCursorBounds(const SelectionModel& caret, bool insert_mode);
// Compute the current cursor bounds, panning the text to show the cursor in
@@ -401,9 +398,10 @@
const Rect& GetUpdatedCursorBounds();
// Given an |index| in text(), return the next or previous grapheme boundary
- // in logical order (i.e. the nearest cursorable index). The return value is
- // in the range 0 to text().length() inclusive (the input is clamped if it is
- // out of that range). Always moves by at least one character index unless the
+ // in logical order (that is, the nearest index for which
+ // |IsCursorablePosition(index)| returns true). The return value is in the
+ // range 0 to text().length() inclusive (the input is clamped if it is out of
+ // that range). Always moves by at least one character index unless the
// supplied index is already at the boundary of the string.
size_t IndexOfAdjacentGrapheme(size_t index,
LogicalCursorDirection direction);
« no previous file with comments | « no previous file | ui/gfx/render_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698