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

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

Issue 11535014: Replace StyleRange with BreakList; update RenderText, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 10 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 »
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>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 struct TextRun { 54 struct TextRun {
55 CTRunRef ct_run; 55 CTRunRef ct_run;
56 SkPoint origin; 56 SkPoint origin;
57 std::vector<uint16> glyphs; 57 std::vector<uint16> glyphs;
58 std::vector<SkPoint> glyph_positions; 58 std::vector<SkPoint> glyph_positions;
59 SkScalar width; 59 SkScalar width;
60 std::string font_name; 60 std::string font_name;
61 int font_style; 61 int font_style;
62 SkScalar text_size; 62 SkScalar text_size;
63 SkColor foreground; 63 SkColor foreground;
64 StyleRange style; 64 bool underline;
65 bool strike;
66 bool diagonal_strike;
65 67
66 TextRun(); 68 TextRun();
67 ~TextRun(); 69 ~TextRun();
68 }; 70 };
69 71
70 // Applies RenderText styles to |attr_string| with the given |ct_font|. 72 // Applies RenderText styles to |attr_string| with the given |ct_font|.
71 void ApplyStyles(CFMutableAttributedStringRef attr_string, CTFontRef ct_font); 73 void ApplyStyles(CFMutableAttributedStringRef attr_string, CTFontRef ct_font);
72 74
73 // Updates |runs_| based on |line_| and sets |runs_valid_| to true. 75 // Updates |runs_| based on |line_| and sets |runs_valid_| to true.
74 void ComputeRuns(); 76 void ComputeRuns();
(...skipping 17 matching lines...) Expand all
92 94
93 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 95 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
94 bool runs_valid_; 96 bool runs_valid_;
95 97
96 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 98 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
97 }; 99 };
98 100
99 } // namespace gfx 101 } // namespace gfx
100 102
101 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 103 #endif // UI_GFX_RENDER_TEXT_MAC_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_linux.cc ('k') | ui/gfx/render_text_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698