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

Side by Side Diff: ui/gfx/render_text_mac.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_harfbuzz.h ('k') | ui/gfx/render_text_pango.h » ('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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/mac/scoped_cftyperef.h" 13 #include "base/mac/scoped_cftyperef.h"
14 #include "ui/gfx/render_text.h" 14 #include "ui/gfx/render_text.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 17
18 // RenderTextMac is the Mac implementation of RenderText that uses CoreText for 18 // RenderTextMac is the Mac implementation of RenderText that uses CoreText for
19 // layout and Skia for drawing. 19 // layout and Skia for drawing.
20 // 20 //
21 // Note: The current implementation only supports drawing and sizing the text, 21 // Note: The current implementation only supports drawing and sizing the text,
22 // but not text selection or cursor movement. 22 // but not text selection or cursor movement.
23 class RenderTextMac : public RenderText { 23 class RenderTextMac : public RenderText {
24 public: 24 public:
25 RenderTextMac(); 25 RenderTextMac();
26 virtual ~RenderTextMac(); 26 virtual ~RenderTextMac();
27 27
28 // Overridden from RenderText: 28 // Overridden from RenderText:
29 virtual Size GetStringSize() OVERRIDE; 29 virtual Size GetStringSize() override;
30 virtual SizeF GetStringSizeF() OVERRIDE; 30 virtual SizeF GetStringSizeF() 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 int GetLayoutTextBaseline() OVERRIDE; 36 virtual int GetLayoutTextBaseline() override;
37 virtual SelectionModel AdjacentCharSelectionModel( 37 virtual SelectionModel AdjacentCharSelectionModel(
38 const SelectionModel& selection, 38 const SelectionModel& selection,
39 VisualCursorDirection direction) OVERRIDE; 39 VisualCursorDirection direction) override;
40 virtual SelectionModel AdjacentWordSelectionModel( 40 virtual SelectionModel AdjacentWordSelectionModel(
41 const SelectionModel& selection, 41 const SelectionModel& selection,
42 VisualCursorDirection direction) OVERRIDE; 42 VisualCursorDirection direction) override;
43 virtual Range GetGlyphBounds(size_t index) OVERRIDE; 43 virtual Range GetGlyphBounds(size_t index) override;
44 virtual std::vector<Rect> GetSubstringBounds(const Range& range) OVERRIDE; 44 virtual std::vector<Rect> GetSubstringBounds(const Range& range) override;
45 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 45 virtual size_t TextIndexToLayoutIndex(size_t index) const override;
46 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 46 virtual size_t LayoutIndexToTextIndex(size_t index) const override;
47 virtual bool IsValidCursorIndex(size_t index) OVERRIDE; 47 virtual bool IsValidCursorIndex(size_t index) override;
48 virtual void ResetLayout() OVERRIDE; 48 virtual void ResetLayout() override;
49 virtual void EnsureLayout() OVERRIDE; 49 virtual void EnsureLayout() override;
50 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 50 virtual void DrawVisualText(Canvas* canvas) override;
51 51
52 private: 52 private:
53 struct TextRun { 53 struct TextRun {
54 CTRunRef ct_run; 54 CTRunRef ct_run;
55 SkPoint origin; 55 SkPoint origin;
56 std::vector<uint16> glyphs; 56 std::vector<uint16> glyphs;
57 std::vector<SkPoint> glyph_positions; 57 std::vector<SkPoint> glyph_positions;
58 SkScalar width; 58 SkScalar width;
59 std::string font_name; 59 std::string font_name;
60 int font_style; 60 int font_style;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 94 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
95 bool runs_valid_; 95 bool runs_valid_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 97 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
98 }; 98 };
99 99
100 } // namespace gfx 100 } // namespace gfx
101 101
102 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 102 #endif // UI_GFX_RENDER_TEXT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_harfbuzz.h ('k') | ui/gfx/render_text_pango.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698