| Index: src/ports/SkFontConfigParser_android.h
|
| diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h
|
| index fd64496f774fe1f9f0851a2fa10f3b0dd5918064..e2247efb0ab42d0524b8a683d348f464b269f9f2 100644
|
| --- a/src/ports/SkFontConfigParser_android.h
|
| +++ b/src/ports/SkFontConfigParser_android.h
|
| @@ -15,9 +15,7 @@
|
| #include "SkTDArray.h"
|
|
|
| struct FontFileInfo {
|
| - FontFileInfo() : fFileName(NULL) {}
|
| -
|
| - const char* fFileName;
|
| + SkString fFileName;
|
| SkPaintOptionsAndroid fPaintOptions;
|
| };
|
|
|
| @@ -32,8 +30,8 @@ struct FontFileInfo {
|
| struct FontFamily {
|
| FontFamily() : fIsFallbackFont(false), order(-1) {}
|
|
|
| - SkTDArray<const char*> fNames;
|
| - SkTDArray<FontFileInfo*> fFontFiles;
|
| + SkTArray<SkString> fNames;
|
| + SkTArray<FontFileInfo> fFontFiles;
|
| bool fIsFallbackFont;
|
| int order; // only used internally by SkFontConfigParser
|
| };
|
|
|