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

Unified Diff: views/controls/textfield/native_textfield_views.h

Issue 7265011: RenderText API Outline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix permissions, export RenderText and StyleRange via UI_API. Created 9 years, 5 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
Index: views/controls/textfield/native_textfield_views.h
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 485154993fec49386a36025398c1f24f63bd5a0c..ea6fec8610e5dc3fbde895c585f5ce219af119d2 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -114,10 +114,8 @@ class NativeTextfieldViews : public View,
virtual void HandleFocus() OVERRIDE;
virtual void HandleBlur() OVERRIDE;
virtual TextInputClient* GetTextInputClient() OVERRIDE;
- virtual TextStyle* CreateTextStyle() OVERRIDE;
- virtual void ApplyTextStyle(const TextStyle* style,
- const ui::Range& range) OVERRIDE;
- virtual void ClearAllTextStyles() OVERRIDE;
+ virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;
+ virtual void ApplyDefaultStyle() OVERRIDE;
virtual void ClearEditHistory() OVERRIDE;
// ui::SimpleMenuModel::Delegate overrides
@@ -164,11 +162,8 @@ class NativeTextfieldViews : public View,
// Overridden from TextfieldViewsModel::Delegate:
virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE;
- // Returns the Textfield's font.
- const gfx::Font& GetFont() const;
-
- // Returns the Textfield's text color.
- SkColor GetTextColor() const;
+ // Returns the TextfieldViewsModel's text/cursor/selection rendering model.
+ gfx::RenderText* GetRenderText() const;
// A callback function to periodically update the cursor state.
void UpdateCursor();
@@ -176,9 +171,6 @@ class NativeTextfieldViews : public View,
// Repaint the cursor.
void RepaintCursor();
- // Returns the bounds of character at the current cursor.
- gfx::Rect GetCursorBounds(size_t cursor_pos, bool insert_mode) const;
-
// Update the cursor_bounds and text_offset.
void UpdateCursorBoundsAndTextOffset(size_t cursor_pos, bool insert_mode);
@@ -187,12 +179,6 @@ class NativeTextfieldViews : public View,
// Handle the keyevent.
bool HandleKeyEvent(const KeyEvent& key_event);
- // Find a cusor position for given |point| in this views coordinates.
- size_t FindCursorPosition(const gfx::Point& point) const;
-
- // Returns true if the local point is over the selected range of text.
- bool IsPointInSelection(const gfx::Point& point) const;
-
// Helper function to call MoveCursorTo on the TextfieldViewsModel.
bool MoveCursorTo(const gfx::Point& point, bool select);
@@ -236,16 +222,8 @@ class NativeTextfieldViews : public View,
// The reference to the border class. The object is owned by View::border_.
FocusableBorder* text_border_;
- // The x offset for the text to be drawn, without insets;
- int text_offset_;
-
- // True if the textfield is in insert mode.
- bool insert_;
-
- // The local bounds and visibility of the textfield's text cursor.
- gfx::Rect cursor_bounds_;
+ // The textfield's text and drop cursor visibility.
bool is_cursor_visible_;
-
// The drop cursor is a visual cue for where dragged text will be dropped.
bool is_drop_cursor_visible_;

Powered by Google App Engine
This is Rietveld 408576698