Simplifed patch

Author: tonsky

patches/ext_SkTypeface_win_dw.patch

@@ -1,12 +1,18 @@
 diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
-index b9d69ab303204b68f97a1cae3bafbb1f77f0ac67..e434abba3b0c75dff4a48600e34c91ac6e9d766a 100644
+index b9d69ab303..36e8422f4f 100644
 --- a/src/ports/SkTypeface_win_dw.cpp
 +++ b/src/ports/SkTypeface_win_dw.cpp
-@@ -543,6 +543,12 @@ std::unique_ptr<SkScalerContext> DWriteFontTypeface::onCreateScalerContext(
+@@ -543,6 +543,18 @@ std::unique_ptr<SkScalerContext> DWriteFontTypeface::onCreateScalerContext(
              sk_ref_sp(const_cast<DWriteFontTypeface*>(this)), effects, desc);
  }
 
-+static std::atomic<int> gUseSystemRenderingParams{-1};
++static std::atomic<int> gUseSystemRenderingParams{
++#if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS)
++    1
++#else
++    0
++#endif
++};
 +
 +extern "C" void DWriteTypeface_UseSystemRenderingParams(int value) {
 +    gUseSystemRenderingParams.store(value);
@@ -15,14 +21,11 @@ index b9d69ab303204b68f97a1cae3bafbb1f77f0ac67..e434abba3b0c75dff4a48600e34c91ac
  void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
      if (rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) {
          rec->fMaskFormat = SkMask::kA8_Format;
-@@ -561,19 +567,31 @@ void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
+@@ -561,19 +573,19 @@ void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
      }
      rec->setHinting(h);
 
-+    int setting = gUseSystemRenderingParams.load();
-+    bool useSystem;
-+    if (setting == -1) {
- #if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS)
+-#if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS)
 -    IDWriteFactory* factory = sk_get_dwrite_factory();
 -    if (factory != nullptr) {
 -        SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;
@@ -32,15 +35,7 @@ index b9d69ab303204b68f97a1cae3bafbb1f77f0ac67..e434abba3b0c75dff4a48600e34c91ac
 -            rec->setPaintGamma(gamma);
 -
 -            rec->setContrast(defaultRenderingParams->GetEnhancedContrast());
-+        useSystem = true;
-+#else
-+        useSystem = false;
-+#endif
-+    } else {
-+        useSystem = (setting == 1);
-+    }
-+
-+    if (useSystem) {
++    if (gUseSystemRenderingParams.load() == 1) {
 +        IDWriteFactory* factory = sk_get_dwrite_factory();
 +        if (factory != nullptr) {
 +            SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;