Bug 1135200: Hook up nsCSSParser's pref-backed bool variables in a st…

…artup method. r=heycam
rmottola · Aug 5, 2019 · e129dcf · e129dcf
1 parent c42ebc7
commit e129dcf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
@@ -240,6 +240,7 @@ nsLayoutStatics::Initialize()
     return rv;
   }
 
+  nsCSSParser::Startup();
   nsCSSRuleProcessor::Startup();
 
 #ifdef MOZ_XUL

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
@@ -54,6 +54,9 @@ using namespace mozilla;
 
 typedef nsCSSProps::KTableValue KTableValue;
 
+// pref-backed bool values (hooked up in nsCSSParser::Startup)
+static bool sOpentypeSVGEnabled;
+
 const uint32_t
 nsCSSProps::kParserVariantTable[eCSSProperty_COUNT_no_shorthands] = {
 #define CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, \
@@ -6989,13 +6992,6 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
         }
       }
       if ((aVariantMask & VARIANT_OPENTYPE_SVG_KEYWORD) != 0) {
-        static bool sOpentypeSVGEnabled;
-        static bool sOpentypeSVGEnabledCached = false;
-        if (!sOpentypeSVGEnabledCached) {
-          sOpentypeSVGEnabledCached = true;
-          Preferences::AddBoolVarCache(&sOpentypeSVGEnabled,
-                                       "gfx.font_rendering.opentype_svg.enabled");
-        }
         if (sOpentypeSVGEnabled) {
           aVariantMask |= VARIANT_KEYWORD;
         }
@@ -15195,6 +15191,13 @@ CSSParserImpl::IsValueValidForProperty(const nsCSSProperty aPropID,
 
 static CSSParserImpl* gFreeList = nullptr;
 
+/* static */ void
+nsCSSParser::Startup()
+{
+  Preferences::AddBoolVarCache(&sOpentypeSVGEnabled,
+                               "gfx.font_rendering.opentype_svg.enabled");
+}
+
 nsCSSParser::nsCSSParser(mozilla::css::Loader* aLoader,
                          CSSStyleSheet* aSheet)
 {

diff --git a/layout/style/nsCSSParser.h b/layout/style/nsCSSParser.h
@@ -45,6 +45,7 @@ class MOZ_STACK_CLASS nsCSSParser {
                        mozilla::CSSStyleSheet* aSheet = nullptr);
   ~nsCSSParser();
 
+  static void Startup();
   static void Shutdown();
 
 private: