ui/gfx/render_text_mac.h - Issue 21140002: Consolidate RenderText adjacent word selection model code.

Side by Side Diff: ui/gfx/render_text_mac.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_linux.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »

OLD	NEW
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 18 matching lines...) Expand all Loading...
29 virtual Size GetStringSize() OVERRIDE;	29 virtual Size GetStringSize() OVERRIDE;

30 virtual int GetBaseline() OVERRIDE;	30 virtual int GetBaseline() OVERRIDE;

31 virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;	31 virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;

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(

40 const SelectionModel& selection,

41 VisualCursorDirection direction) OVERRIDE;

42 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;	39 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;

43 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;	40 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;

44 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;	41 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;

45 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;	42 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;

46 virtual bool IsCursorablePosition(size_t position) OVERRIDE;	43 virtual bool IsCursorablePosition(size_t position) OVERRIDE;

47 virtual void ResetLayout() OVERRIDE;	44 virtual void ResetLayout() OVERRIDE;

48 virtual void EnsureLayout() OVERRIDE;	45 virtual void EnsureLayout() OVERRIDE;

49 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;	46 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;

50	47

51 private:	48 private:

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92	89

93 // Indicates that \|runs_\| are valid, set by \|ComputeRuns()\|.	90 // Indicates that \|runs_\| are valid, set by \|ComputeRuns()\|.

94 bool runs_valid_;	91 bool runs_valid_;

95	92

96 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);	93 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);

97 };	94 };

98	95

99 } // namespace gfx	96 } // namespace gfx

100	97

101 #endif // UI_GFX_RENDER_TEXT_MAC_H_	98 #endif // UI_GFX_RENDER_TEXT_MAC_H_

OLD	NEW