Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / ports / SkFontConfigParser_android.h

diff --git a/src/third_party/skia/src/ports/SkFontConfigParser_android.h b/src/third_party/skia/src/ports/SkFontConfigParser_android.h
index fd64496..e2247ef 100644 (file)
--- a/src/third_party/skia/src/ports/SkFontConfigParser_android.h
+++ b/src/third_party/skia/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
 };