From a9f1db7902227143f97e4e29c1eefcd690f6aced Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 27 May 2015 13:10:02 -0700 Subject: Use SkTArray instead of SkSTArray in movable. SkTArray is trivially movable, but SkSTArray is not, since it may contain an internal pointer. FontFileInfo is supposed to be trivially movable but currently isn't due to containing an SkSTArray. Removing this particular optimization should not affect performance much as this type is only used for parsing and does not allocate any memory unless a variation axis is actually specified. Review URL: https://codereview.chromium.org/1155383002 --- src/ports/SkFontConfigParser_android.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h index c1327ff74e..6665e189b4 100644 --- a/src/ports/SkFontConfigParser_android.h +++ b/src/ports/SkFontConfigParser_android.h @@ -76,7 +76,7 @@ struct FontFileInfo { SkFourByteTag fTag; SkFixed fValue; }; - SkSTArray<4, Axis, true> fAxes; + SkTArray fAxes; }; /** -- cgit v1.2.3