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

Side by Side Diff: ui/gfx/render_text_linux.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.cc ('k') | ui/gfx/render_text_linux.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_LINUX_H_ 5 #ifndef UI_GFX_RENDER_TEXT_LINUX_H_
6 #define UI_GFX_RENDER_TEXT_LINUX_H_ 6 #define UI_GFX_RENDER_TEXT_LINUX_H_
7 7
8 #include <pango/pango.h> 8 #include <pango/pango.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; 25 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
26 26
27 protected: 27 protected:
28 // Overridden from RenderText: 28 // Overridden from RenderText:
29 virtual SelectionModel AdjacentCharSelectionModel( 29 virtual SelectionModel AdjacentCharSelectionModel(
30 const SelectionModel& selection, 30 const SelectionModel& selection,
31 VisualCursorDirection direction) OVERRIDE; 31 VisualCursorDirection direction) OVERRIDE;
32 virtual SelectionModel AdjacentWordSelectionModel( 32 virtual SelectionModel AdjacentWordSelectionModel(
33 const SelectionModel& selection, 33 const SelectionModel& selection,
34 VisualCursorDirection direction) OVERRIDE; 34 VisualCursorDirection direction) OVERRIDE;
35 virtual void GetGlyphBounds(size_t index, 35 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
36 ui::Range* xspan,
37 int* height) OVERRIDE;
38 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE; 36 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
39 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 37 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
40 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 38 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
41 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 39 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
42 virtual void ResetLayout() OVERRIDE; 40 virtual void ResetLayout() OVERRIDE;
43 virtual void EnsureLayout() OVERRIDE; 41 virtual void EnsureLayout() OVERRIDE;
44 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 42 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
45 43
46 private: 44 private:
47 friend class RenderTextTest; 45 friend class RenderTextTest;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 const char* layout_text_; 81 const char* layout_text_;
84 // The text length. 82 // The text length.
85 size_t layout_text_len_; 83 size_t layout_text_len_;
86 84
87 DISALLOW_COPY_AND_ASSIGN(RenderTextLinux); 85 DISALLOW_COPY_AND_ASSIGN(RenderTextLinux);
88 }; 86 };
89 87
90 } // namespace gfx 88 } // namespace gfx
91 89
92 #endif // UI_GFX_RENDER_TEXT_LINUX_H_ 90 #endif // UI_GFX_RENDER_TEXT_LINUX_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/gfx/render_text_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698