Index: src/ports/SkFontConfigParser_android.h |
diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h |
index 2302c7712e61ee4ecff47ceb8cce758641e96b53..6dbf38359097a47539642ee10e337619ed5275bc 100644 |
--- a/src/ports/SkFontConfigParser_android.h |
+++ b/src/ports/SkFontConfigParser_android.h |
@@ -60,6 +60,7 @@ enum FontVariants { |
}; |
typedef uint32_t FontVariant; |
+// Must remain trivially movable (can be memmoved). |
struct FontFileInfo { |
FontFileInfo() : fIndex(0), fWeight(0) { } |
@@ -83,8 +84,8 @@ struct FontFamily { |
, fBasePath(basePath) |
{ } |
- SkTArray<SkString> fNames; |
- SkTArray<FontFileInfo> fFonts; |
+ SkTArray<SkString, true> fNames; |
+ SkTArray<FontFileInfo, true> fFonts; |
SkLanguage fLanguage; |
FontVariant fVariant; |
int fOrder; // internal to SkFontConfigParser |