| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkPaintPart_DEFINED | 8 #ifndef SkPaintPart_DEFINED |
| 9 #define SkPaintPart_DEFINED | 9 #define SkPaintPart_DEFINED |
| 10 | 10 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 SkDrawMatrix* matrix; | 55 SkDrawMatrix* matrix; |
| 56 int /*SkShader::TileMode*/ tileMode; | 56 int /*SkShader::TileMode*/ tileMode; |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 class SkDrawTypeface : public SkPaintPart { | 59 class SkDrawTypeface : public SkPaintPart { |
| 60 DECLARE_DRAW_MEMBER_INFO(Typeface); | 60 DECLARE_DRAW_MEMBER_INFO(Typeface); |
| 61 SkDrawTypeface(); | 61 SkDrawTypeface(); |
| 62 #ifdef SK_DUMP_ENABLED | 62 #ifdef SK_DUMP_ENABLED |
| 63 void dump(SkAnimateMaker *) override; | 63 void dump(SkAnimateMaker *) override; |
| 64 #endif | 64 #endif |
| 65 sk_sp<SkTypeface> getTypeface() { return SkTypeface::MakeFromName(fontName.c
_str(), style); } | 65 SkTypeface* getTypeface() { |
| 66 return SkTypeface::CreateFromName(fontName.c_str(), style); } |
| 66 protected: | 67 protected: |
| 67 bool add() override; | 68 bool add() override; |
| 68 SkString fontName; | 69 SkString fontName; |
| 69 SkTypeface::Style style; | 70 SkTypeface::Style style; |
| 70 }; | 71 }; |
| 71 | 72 |
| 72 #endif // SkPaintPart_DEFINED | 73 #endif // SkPaintPart_DEFINED |
| OLD | NEW |