commit de3e1964cf746224a3f8207dae2712c7705331d7
author John Stiles <johnstiles@google.com> Wed Jun 15 09:02:16 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Jun 15 17:22:41 2022 +0000
tree 3f899a6d68a834bd3f1a51f1b823d6636e329734
parent b9307774a22989624e145445b3da5a0aa479e2d3

Prevent kDefaultFontFamilies from being destroyed during atexit.

Change-Id: Ie9324622c27fefe2d876f462b7c106dbc2a4f2cb
Bug: skia:13432
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/550177
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

modules/skparagraph/include/TextStyle.h

diff --git a/modules/skparagraph/include/TextStyle.h b/modules/skparagraph/include/TextStyle.h
index 19220eb..82b4a7c 100644
--- a/modules/skparagraph/include/TextStyle.h
+++ b/modules/skparagraph/include/TextStyle.h
@@ -260,7 +260,7 @@
     void setPlaceholder() { fIsPlaceholder = true; }
 
 private:
-    static const std::vector<SkString> kDefaultFontFamilies;
+    static const std::vector<SkString>* kDefaultFontFamilies;
 
     Decoration fDecoration = {
             TextDecoration::kNoDecoration,
@@ -274,7 +274,7 @@
 
     SkFontStyle fFontStyle;
 
-    std::vector<SkString> fFontFamilies = kDefaultFontFamilies;
+    std::vector<SkString> fFontFamilies = *kDefaultFontFamilies;
 
     SkScalar fFontSize = 14.0;
     SkScalar fHeight = 1.0;

modules/skparagraph/src/TextStyle.cpp

diff --git a/modules/skparagraph/src/TextStyle.cpp b/modules/skparagraph/src/TextStyle.cpp
index 03c77d0..492f94f 100644
--- a/modules/skparagraph/src/TextStyle.cpp
+++ b/modules/skparagraph/src/TextStyle.cpp
@@ -6,7 +6,8 @@
 namespace skia {
 namespace textlayout {
 
-const std::vector<SkString> TextStyle::kDefaultFontFamilies = { SkString(DEFAULT_FONT_FAMILY) };
+const std::vector<SkString>* TextStyle::kDefaultFontFamilies =
+        new std::vector<SkString>{SkString(DEFAULT_FONT_FAMILY)};
 
 TextStyle TextStyle::cloneForPlaceholder() {
     TextStyle result;