AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass SkGraphcis::GetVariableColrV1Enabled() to FreeType

Browse Source 
In [1] SkGraphics was changed to receive a flag callback from Blink if
variable COLRv1 is enabled. Pass this flag down to the corresponding
FreeType property in order to be able to continuously land changes in
FreeType for COLRv1 until shipping it.

Roll FreeType to current head, to include property addition to FreeType
in [2].

[1] https://skia-review.googlesource.com/c/skia/+/551637
[2] 4b6f92e6b3

Bug: skia:13448
Change-Id: I296ec5c5b4093cb1af0300de7d1eadcc8e740a36
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/553436
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Dominik Röttsches <drott@google.com>
This commit is contained in:
Dominik Röttsches 2022-06-27 18:12:06 +03:00 committed by SkCQ
parent 86678ed625
commit b17a4843ec
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -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",

8
src/ports/SkFontHost_FreeType.cpp
View File

@ -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.