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

Unified 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, 8 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_mac.h
diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
index e1dbb6ff8764938d3a379da3c38df96a56cc2823..a437ac57982d140797fa35616c3d5d30389bf81a 100644
--- a/ui/gfx/render_text_mac.h
+++ b/ui/gfx/render_text_mac.h
@@ -68,7 +68,7 @@ class GFX_EXPORT RenderTextMac : public RenderText {
std::vector<uint16_t> glyphs;
std::vector<SkPoint> glyph_positions;
SkScalar width;
- Font font;
+ base::ScopedCFTypeRef<CTFontRef> ct_font;
sk_sp<SkTypeface> typeface;
SkColor foreground;
bool underline;
@@ -76,7 +76,8 @@ class GFX_EXPORT RenderTextMac : public RenderText {
bool diagonal_strike;
TextRun();
- TextRun(const TextRun& other);
+ TextRun(const TextRun& other) = delete;
+ TextRun(TextRun&& other);
~TextRun();
};
« 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