diff --git a/DEPS b/DEPS index e34ce42e51..2412a43266 100644 --- a/DEPS +++ b/DEPS @@ -22,7 +22,7 @@ deps = { "third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae", "third_party/externals/emsdk" : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@e34773a0d1a2f32dd3ba90d408a30fae89aa3c5a", "third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee", - "third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@8bb7722a5315fe9f176821242fd453fadb3004da", + "third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@2db58e061ecc0d738a41d13ed8908e967bd0014c", "third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@858570b1d9912a1b746ab39fbe62a646c4f7a5b1", "third_party/externals/highway" : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0", "third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f", diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 0d5bebac9e..35d196be94 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -143,6 +143,14 @@ public: FT_Add_Default_Modules(fLibrary); FT_Set_Default_Properties(fLibrary); +#ifdef TT_SUPPORT_COLRV1 + if (SkGraphics::GetVariableColrV1Enabled()) { + FT_Bool variableColrV1Enabled = true; + FT_Property_Set( + fLibrary, "truetype", "TEMPORARY-enable-variable-colrv1", &variableColrV1Enabled); + } +#endif + // Subpixel anti-aliasing may be unfiltered until the LCD filter is set. // Newer versions may still need this, so this test with side effects must come first. // The default has changed over time, so this doesn't mean the same thing to all users.