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

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

Issue 968923004: Use GetDisplayText() instead of text() for rendering text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 9 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.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>
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 {
tapted 2015/03/06 11:16:18 I think you're going to need GFX_EXPORT here
24 public: 24 public:
25 RenderTextMac(); 25 RenderTextMac();
26 ~RenderTextMac() override; 26 ~RenderTextMac() override;
27 27
28 // RenderText: 28 // RenderText:
29 scoped_ptr<RenderText> CreateInstanceOfSameType() const override; 29 scoped_ptr<RenderText> CreateInstanceOfSameType() const override;
30 const base::string16& GetDisplayText() override; 30 const base::string16& GetDisplayText() override;
31 Size GetStringSize() override; 31 Size GetStringSize() override;
32 SizeF GetStringSizeF() override; 32 SizeF GetStringSizeF() override;
33 SelectionModel FindCursorPosition(const Point& point) override; 33 SelectionModel FindCursorPosition(const Point& point) override;
(...skipping 12 matching lines...) Expand all
46 std::vector<Rect> GetSubstringBounds(const Range& range) override; 46 std::vector<Rect> GetSubstringBounds(const Range& range) override;
47 size_t TextIndexToDisplayIndex(size_t index) override; 47 size_t TextIndexToDisplayIndex(size_t index) override;
48 size_t DisplayIndexToTextIndex(size_t index) override; 48 size_t DisplayIndexToTextIndex(size_t index) override;
49 bool IsValidCursorIndex(size_t index) override; 49 bool IsValidCursorIndex(size_t index) override;
50 void OnLayoutTextAttributeChanged(bool text_changed) override; 50 void OnLayoutTextAttributeChanged(bool text_changed) override;
51 void OnDisplayTextAttributeChanged() override; 51 void OnDisplayTextAttributeChanged() override;
52 void EnsureLayout() override; 52 void EnsureLayout() override;
53 void DrawVisualText(Canvas* canvas) override; 53 void DrawVisualText(Canvas* canvas) override;
54 54
55 private: 55 private:
56 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText);
57
56 struct TextRun { 58 struct TextRun {
57 CTRunRef ct_run; 59 CTRunRef ct_run;
58 SkPoint origin; 60 SkPoint origin;
59 std::vector<uint16> glyphs; 61 std::vector<uint16> glyphs;
60 std::vector<SkPoint> glyph_positions; 62 std::vector<SkPoint> glyph_positions;
61 SkScalar width; 63 SkScalar width;
62 std::string font_name; 64 std::string font_name;
63 int font_style; 65 int font_style;
64 SkScalar text_size; 66 SkScalar text_size;
65 SkColor foreground; 67 SkColor foreground;
66 bool underline; 68 bool underline;
67 bool strike; 69 bool strike;
68 bool diagonal_strike; 70 bool diagonal_strike;
69 71
70 TextRun(); 72 TextRun();
71 ~TextRun(); 73 ~TextRun();
72 }; 74 };
73 75
76 // Returns the width used to draw |layout_text_|.
77 float GetLayoutTextWidth();
78
79 // Computes the size used to draw |line|. Stores the baseline position into
80 // |baseline|.
81 gfx::SizeF GetCTLineSize(CTLineRef line, SkScalar* baseline);
82
83 // Creates Core Text line object and its attributes for the given text and
84 // returns the line. |attributes| keeps the ownership of the text attributes.
85 // See the comments of ArrayStyles() implementation for the ownership details.
86 base::ScopedCFTypeRef<CTLineRef> EnsureLayoutInternal(
87 const base::string16& text,
88 base::ScopedCFTypeRef<CFMutableArrayRef>* attributes);
89
74 // Applies RenderText styles to |attr_string| with the given |ct_font|. 90 // Applies RenderText styles to |attr_string| with the given |ct_font|.
75 void ApplyStyles(CFMutableAttributedStringRef attr_string, CTFontRef ct_font); 91 // Returns the array of attributes to keep the ownership of the attributes.
92 // See the comments in .cc file for the details.
93 base::ScopedCFTypeRef<CFMutableArrayRef> ApplyStyles(
94 const base::string16& text,
95 CFMutableAttributedStringRef attr_string,
96 CTFontRef ct_font);
76 97
77 // Updates |runs_| based on |line_| and sets |runs_valid_| to true. 98 // Updates |runs_| based on |line_| and sets |runs_valid_| to true.
78 void ComputeRuns(); 99 void ComputeRuns();
79 100
80 // The Core Text line of text. Created by |EnsureLayout()|. 101 // The Core Text line of text. Created by |EnsureLayout()|.
81 base::ScopedCFTypeRef<CTLineRef> line_; 102 base::ScopedCFTypeRef<CTLineRef> line_;
82 103
83 // Array to hold CFAttributedString attributes that allows Core Text to hold 104 // Array to hold CFAttributedString attributes that allows Core Text to hold
84 // weak references to them without leaking. 105 // weak references to them without leaking.
85 base::ScopedCFTypeRef<CFMutableArrayRef> attributes_; 106 base::ScopedCFTypeRef<CFMutableArrayRef> attributes_;
(...skipping 10 matching lines...) Expand all
96 117
97 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 118 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
98 bool runs_valid_; 119 bool runs_valid_;
99 120
100 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 121 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
101 }; 122 };
102 123
103 } // namespace gfx 124 } // namespace gfx
104 125
105 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 126 #endif // UI_GFX_RENDER_TEXT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698