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

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

Issue 15746013: Fix cursor positioning regression from r201136. GetCursorPos() shouldn't assume (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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_linux.cc ('k') | ui/gfx/render_text_mac.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_MAC_H_ 5 #ifndef UI_GFX_RENDER_TEXT_MAC_H_
6 #define UI_GFX_RENDER_TEXT_MAC_H_ 6 #define UI_GFX_RENDER_TEXT_MAC_H_
7 7
8 #include <ApplicationServices/ApplicationServices.h> 8 #include <ApplicationServices/ApplicationServices.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 21 matching lines...) Expand all
32 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; 32 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
33 33
34 protected: 34 protected:
35 // Overridden from RenderText: 35 // Overridden from RenderText:
36 virtual SelectionModel AdjacentCharSelectionModel( 36 virtual SelectionModel AdjacentCharSelectionModel(
37 const SelectionModel& selection, 37 const SelectionModel& selection,
38 VisualCursorDirection direction) OVERRIDE; 38 VisualCursorDirection direction) OVERRIDE;
39 virtual SelectionModel AdjacentWordSelectionModel( 39 virtual SelectionModel AdjacentWordSelectionModel(
40 const SelectionModel& selection, 40 const SelectionModel& selection,
41 VisualCursorDirection direction) OVERRIDE; 41 VisualCursorDirection direction) OVERRIDE;
42 virtual void GetGlyphBounds(size_t index, 42 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
43 ui::Range* xspan,
44 int* height) OVERRIDE;
45 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE; 43 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
46 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 44 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
47 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 45 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
48 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 46 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
49 virtual void ResetLayout() OVERRIDE; 47 virtual void ResetLayout() OVERRIDE;
50 virtual void EnsureLayout() OVERRIDE; 48 virtual void EnsureLayout() OVERRIDE;
51 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 49 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
52 50
53 private: 51 private:
54 struct TextRun { 52 struct TextRun {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 92
95 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 93 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
96 bool runs_valid_; 94 bool runs_valid_;
97 95
98 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 96 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
99 }; 97 };
100 98
101 } // namespace gfx 99 } // namespace gfx
102 100
103 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 101 #endif // UI_GFX_RENDER_TEXT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_linux.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698