commit 343553a1fe9ec65ee6526015a7972435914d7a48
author Brian Salomon <bsalomon@google.com> Wed Sep 05 15:41:23 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 05 20:11:07 2018 +0000
tree e3de284bd06905893e6a7f5ef5fd24674fb633cf
parent da58cac61d483478794493a13e288cfa41e49c50

Don't use MEM_MOVE=true with SkTArrays of sk_sp

The code generated from std::move()ing them should be fine.

Bug: skia:8355
Change-Id: I63ef650b5fbcf9fb6356006190eae5e0977ae642
Reviewed-on: https://skia-review.googlesource.com/151982
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/ports/SkFontMgr_android.cpp

diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
index feb22c8..70e4c13 100644
--- a/src/ports/SkFontMgr_android.cpp
+++ b/src/ports/SkFontMgr_android.cpp
@@ -267,7 +267,7 @@
     }
 
 private:
-    SkTArray<sk_sp<SkTypeface_AndroidSystem>, true> fStyles;
+    SkTArray<sk_sp<SkTypeface_AndroidSystem>> fStyles;
 
     friend struct NameToFamily;
     friend class SkFontMgr_Android;
@@ -515,7 +515,7 @@
 
     SkTypeface_FreeType::Scanner fScanner;
 
-    SkTArray<sk_sp<SkFontStyleSet_Android>, true> fStyleSets;
+    SkTArray<sk_sp<SkFontStyleSet_Android>> fStyleSets;
     sk_sp<SkFontStyleSet> fDefaultStyleSet;
 
     SkTArray<NameToFamily, true> fNameToFamilyMap;