diff options
| author |  bungeman <bungeman@google.com> | 2015-05-27 13:10:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-27 13:10:03 -0700 |
| commit | a9f1db7902227143f97e4e29c1eefcd690f6aced (patch) | |
| tree | 90b00c8e40ed5710e0f27413ac7ba40c028874fa /src/ports | |
| parent | 9700206b67ef2a0aab9a8211c8a901d5123afa9f (diff) | |
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
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontConfigParser_android.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<Axis, true> fAxes; }; /** |