| 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();
|
| };
|
|
|
|
|