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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/gfx/render_text_pango.h ('k') | ui/gfx/screen_android.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 } // namespace internal 57 } // namespace internal
58 58
59 // RenderTextWin is the Windows implementation of RenderText using Uniscribe. 59 // RenderTextWin is the Windows implementation of RenderText using Uniscribe.
60 class RenderTextWin : public RenderText { 60 class RenderTextWin : public RenderText {
61 public: 61 public:
62 RenderTextWin(); 62 RenderTextWin();
63 virtual ~RenderTextWin(); 63 virtual ~RenderTextWin();
64 64
65 // Overridden from RenderText: 65 // Overridden from RenderText:
66 virtual Size GetStringSize() OVERRIDE; 66 virtual Size GetStringSize() override;
67 virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; 67 virtual SelectionModel FindCursorPosition(const Point& point) override;
68 virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; 68 virtual std::vector<FontSpan> GetFontSpansForTesting() override;
69 69
70 protected: 70 protected:
71 // Overridden from RenderText: 71 // Overridden from RenderText:
72 virtual int GetLayoutTextBaseline() OVERRIDE; 72 virtual int GetLayoutTextBaseline() override;
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( 76 virtual SelectionModel AdjacentWordSelectionModel(
77 const SelectionModel& selection, 77 const SelectionModel& selection,
78 VisualCursorDirection direction) OVERRIDE; 78 VisualCursorDirection direction) override;
79 virtual Range GetGlyphBounds(size_t index) OVERRIDE; 79 virtual Range GetGlyphBounds(size_t index) override;
80 virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; 80 virtual std::vector<Rect> GetSubstringBounds(const Range& range) override;
81 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 81 virtual size_t TextIndexToLayoutIndex(size_t index) const override;
82 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 82 virtual size_t LayoutIndexToTextIndex(size_t index) const override;
83 virtual bool IsValidCursorIndex(size_t index) OVERRIDE; 83 virtual bool IsValidCursorIndex(size_t index) override;
84 virtual void ResetLayout() OVERRIDE; 84 virtual void ResetLayout() override;
85 virtual void EnsureLayout() OVERRIDE; 85 virtual void EnsureLayout() override;
86 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 86 virtual void DrawVisualText(Canvas* canvas) override;
87 87
88 private: 88 private:
89 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_BreakRunsByUnicodeBlocks); 89 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_BreakRunsByUnicodeBlocks);
90 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 90 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
91 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 91 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
92 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 92 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
93 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks); 93 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks);
94 94
95 void ItemizeLogicalText(); 95 void ItemizeLogicalText();
96 void LayoutVisualText(); 96 void LayoutVisualText();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 scoped_ptr<int[]> logical_to_visual_; 137 scoped_ptr<int[]> logical_to_visual_;
138 138
139 bool needs_layout_; 139 bool needs_layout_;
140 140
141 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); 141 DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
142 }; 142 };
143 143
144 } // namespace gfx 144 } // namespace gfx
145 145
146 #endif // UI_GFX_RENDER_TEXT_WIN_H_ 146 #endif // UI_GFX_RENDER_TEXT_WIN_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_pango.h ('k') | ui/gfx/screen_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698