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

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

Issue 1925033002: RenderText: Don't default-construct gfx::Fonts unnecessarily (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove gfx::Font from RTM completely Created 4 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
« no previous file with comments | « ui/gfx/render_text_harfbuzz.cc ('k') | ui/gfx/render_text_mac.mm » ('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 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 private: 62 private:
63 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText); 63 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText);
64 64
65 struct TextRun { 65 struct TextRun {
66 CTRunRef ct_run; 66 CTRunRef ct_run;
67 SkPoint origin; 67 SkPoint origin;
68 std::vector<uint16_t> glyphs; 68 std::vector<uint16_t> glyphs;
69 std::vector<SkPoint> glyph_positions; 69 std::vector<SkPoint> glyph_positions;
70 SkScalar width; 70 SkScalar width;
71 Font font; 71 base::ScopedCFTypeRef<CTFontRef> ct_font;
72 sk_sp<SkTypeface> typeface; 72 sk_sp<SkTypeface> typeface;
73 SkColor foreground; 73 SkColor foreground;
74 bool underline; 74 bool underline;
75 bool strike; 75 bool strike;
76 bool diagonal_strike; 76 bool diagonal_strike;
77 77
78 TextRun(); 78 TextRun();
79 TextRun(const TextRun& other); 79 TextRun(const TextRun& other) = delete;
80 TextRun(TextRun&& other);
80 ~TextRun(); 81 ~TextRun();
81 }; 82 };
82 83
83 // Returns the width used to draw |layout_text_|. 84 // Returns the width used to draw |layout_text_|.
84 float GetLayoutTextWidth(); 85 float GetLayoutTextWidth();
85 86
86 // Computes the size used to draw |line|. Stores the baseline position into 87 // Computes the size used to draw |line|. Stores the baseline position into
87 // |baseline|. 88 // |baseline|.
88 gfx::SizeF GetCTLineSize(CTLineRef line, SkScalar* baseline); 89 gfx::SizeF GetCTLineSize(CTLineRef line, SkScalar* baseline);
89 90
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 128
128 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 129 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
129 bool runs_valid_; 130 bool runs_valid_;
130 131
131 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 132 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
132 }; 133 };
133 134
134 } // namespace gfx 135 } // namespace gfx
135 136
136 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 137 #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.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698