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

Side by Side Diff: ui/gfx/render_text_win.h

Issue 21140002: Consolidate RenderText adjacent word selection model code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup comments and add a unit test.~ Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/render_text_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_RENDER_TEXT_WIN_H_ 5 #ifndef UI_GFX_RENDER_TEXT_WIN_H_
6 #define UI_GFX_RENDER_TEXT_WIN_H_ 6 #define UI_GFX_RENDER_TEXT_WIN_H_
7 7
8 #include <usp10.h> 8 #include <usp10.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 virtual Size GetStringSize() OVERRIDE; 66 virtual Size GetStringSize() OVERRIDE;
67 virtual int GetBaseline() OVERRIDE; 67 virtual int GetBaseline() OVERRIDE;
68 virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; 68 virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
69 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; 69 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
70 70
71 protected: 71 protected:
72 // Overridden from RenderText: 72 // Overridden from RenderText:
73 virtual SelectionModel AdjacentCharSelectionModel( 73 virtual SelectionModel AdjacentCharSelectionModel(
74 const SelectionModel& selection, 74 const SelectionModel& selection,
75 VisualCursorDirection direction) OVERRIDE; 75 VisualCursorDirection direction) OVERRIDE;
76 virtual SelectionModel AdjacentWordSelectionModel(
77 const SelectionModel& selection,
78 VisualCursorDirection direction) OVERRIDE;
79 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE; 76 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
80 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE; 77 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
81 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 78 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
82 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 79 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
83 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 80 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
84 virtual void ResetLayout() OVERRIDE; 81 virtual void ResetLayout() OVERRIDE;
85 virtual void EnsureLayout() OVERRIDE; 82 virtual void EnsureLayout() OVERRIDE;
86 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 83 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
87 84
88 private: 85 private:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 scoped_ptr<int[]> logical_to_visual_; 128 scoped_ptr<int[]> logical_to_visual_;
132 129
133 bool needs_layout_; 130 bool needs_layout_;
134 131
135 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); 132 DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
136 }; 133 };
137 134
138 } // namespace gfx 135 } // namespace gfx
139 136
140 #endif // UI_GFX_RENDER_TEXT_WIN_H_ 137 #endif // UI_GFX_RENDER_TEXT_WIN_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/render_text_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698