Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(900)

Unified Diff: src/ports/SkFontConfigParser_android.h

Issue 929473002: FontFamily SkTArrays can be moved. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add comment. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698