blob: 2d24e42ad38a818f3e56210e1b97835b6c08bf7b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 62127ba8d9..73bfaa2af3 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1100,6 +1100,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
FT_UInt layerGlyphIndex;
FT_UInt layerColorIndex;
+#undef TT_SUPPORT_COLRV1 // Unstable API.
#ifdef TT_SUPPORT_COLRV1
FT_OpaquePaint opaqueLayerPaint;
opaqueLayerPaint.p = nullptr;
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index 8488e859b9..baab503bfb 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -30,6 +30,7 @@
// In the past, FT_GlyphSlot_Own_Bitmap was defined in this header file.
#include FT_SYNTHESIS_H
+#undef TT_SUPPORT_COLRV1 // Unstable API.
#ifdef TT_SUPPORT_COLRV1
#include "src/core/SkScopeExit.h"
#endif
|
