m143-da51f0d60e-3 Add runtime control for SK_FONT_HOST_USE_SYSTEM_SETTINGS #14

Author: tonsky

.github/workflows/build.yml

@@ -18,7 +18,7 @@ permissions:
   contents: write
 
 env:
-  version: m143-da51f0d60e-2
+  version: m143-da51f0d60e-3
 
 jobs:
   macos:

patches/ext_SkTypeface_win_dw.patch

@@ -0,0 +1,50 @@
+diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
+index 7452343f6b1..50ba70f1e84 100644
+--- a/src/ports/SkTypeface_win_dw.cpp
++++ b/src/ports/SkTypeface_win_dw.cpp
+@@ -651,6 +651,18 @@ std::unique_ptr<SkScalerContext> DWriteFontTypeface::onCreateScalerContext(
+             *const_cast<DWriteFontTypeface*>(this), effects, desc);
+ }
+ 
++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);
++}
++
+ void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
+     rec->useStrokeForFakeBold();
+ 
+@@ -671,17 +683,17 @@ void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const {
+     }
+     rec->setHinting(h);
+ 
+-#if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS)
+-    IDWriteFactory* factory = sk_get_dwrite_factory();
+-    if (factory != nullptr) {
+-        SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;
+-        if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) {
+-            float gamma = defaultRenderingParams->GetGamma();
+-            rec->setDeviceGamma(gamma);
+-            rec->setContrast(defaultRenderingParams->GetEnhancedContrast());
++    if (gUseSystemRenderingParams.load() == 1) {
++        IDWriteFactory* factory = sk_get_dwrite_factory();
++        if (factory != nullptr) {
++            SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;
++            if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) {
++                float gamma = defaultRenderingParams->GetGamma();
++                rec->setDeviceGamma(gamma);
++                rec->setContrast(defaultRenderingParams->GetEnhancedContrast());
++            }
+         }
+     }
+-#endif
+ }
+ 
+ ///////////////////////////////////////////////////////////////////////////////