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

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

Issue 2943823002: Remove gfx::DIAGONAL_STRIKE and supporting code. (Closed)
Patch Set: Created 3 years, 6 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 CTRunRef ct_run; 67 CTRunRef ct_run;
68 SkPoint origin; 68 SkPoint origin;
69 std::vector<uint16_t> glyphs; 69 std::vector<uint16_t> glyphs;
70 std::vector<SkPoint> glyph_positions; 70 std::vector<SkPoint> glyph_positions;
71 SkScalar width; 71 SkScalar width;
72 base::ScopedCFTypeRef<CTFontRef> ct_font; 72 base::ScopedCFTypeRef<CTFontRef> ct_font;
73 sk_sp<SkTypeface> typeface; 73 sk_sp<SkTypeface> typeface;
74 SkColor foreground; 74 SkColor foreground;
75 bool underline; 75 bool underline;
76 bool strike; 76 bool strike;
77 bool diagonal_strike;
78 77
79 TextRun(); 78 TextRun();
80 TextRun(const TextRun& other) = delete; 79 TextRun(const TextRun& other) = delete;
81 TextRun(TextRun&& other); 80 TextRun(TextRun&& other);
82 ~TextRun(); 81 ~TextRun();
83 }; 82 };
84 83
85 // Returns the width used to draw |layout_text_|. 84 // Returns the width used to draw |layout_text_|.
86 float GetLayoutTextWidth(); 85 float GetLayoutTextWidth();
87 86
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 132
134 // Indicates that |runs_| are valid, set by |ComputeRuns()|. 133 // Indicates that |runs_| are valid, set by |ComputeRuns()|.
135 bool runs_valid_; 134 bool runs_valid_;
136 135
137 DISALLOW_COPY_AND_ASSIGN(RenderTextMac); 136 DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
138 }; 137 };
139 138
140 } // namespace gfx 139 } // namespace gfx
141 140
142 #endif // UI_GFX_RENDER_TEXT_MAC_H_ 141 #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