Roll FreeType to pick up color stuff.
Change-Id: Ide7d414dc0f5e112b213390dc9f62e097c6a7ef9
Reviewed-on: https://skia-review.googlesource.com/130848
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
diff --git a/DEPS b/DEPS
index 0493d27..0dc447e 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
- "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@fa6da7bf6dcbcfa22d2464259ad1cccee3233189",
+ "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@125b84800a3230305b7fbc8eedeee106fa78adae",
"third_party/externals/googletest" : "https://android.googlesource.com/platform/external/googletest@dd43b9998e9a44a579a7aba6c1309407d1a5ed95",
"third_party/externals/harfbuzz" : "https://skia.googlesource.com/third_party/harfbuzz.git@1.4.2",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@ec9c1133693148470ffe2e5e53576998e3650c1d",
diff --git a/third_party/freetype2/include/freetype-android/ftoption.h b/third_party/freetype2/include/freetype-android/ftoption.h
index aa2b589..9296571 100644
--- a/third_party/freetype2/include/freetype-android/ftoption.h
+++ b/third_party/freetype2/include/freetype-android/ftoption.h
@@ -82,6 +82,10 @@
/* to control the various font drivers and modules. The controllable */
/* properties are listed in the section @properties. */
/* */
+ /* You have to undefine this configuration option on platforms that lack */
+ /* the concept of environment variables (and thus don't have the */
+ /* `getenv' function), for example Windows CE. */
+ /* */
/* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */
/* multiple lines for better readability). */
/* */
@@ -483,35 +487,6 @@
/*************************************************************************/
- /* */
- /* Position Independent Code */
- /* */
- /* If this macro is set (which is _not_ the default), FreeType2 will */
- /* avoid creating constants that require address fixups. Instead the */
- /* constants will be moved into a struct and additional intialization */
- /* code will be used. */
- /* */
- /* Setting this macro is needed for systems that prohibit address */
- /* fixups, such as BREW. [Note that standard compilers like gcc or */
- /* clang handle PIC generation automatically; you don't have to set */
- /* FT_CONFIG_OPTION_PIC, which is only necessary for very special */
- /* compilers.] */
- /* */
- /* Note that FT_CONFIG_OPTION_PIC support is not available for all */
- /* modules (see `modules.cfg' for a complete list). For building with */
- /* FT_CONFIG_OPTION_PIC support, do the following. */
- /* */
- /* 0. Clone the repository. */
- /* 1. Define FT_CONFIG_OPTION_PIC. */
- /* 2. Remove all subdirectories in `src' that don't have */
- /* FT_CONFIG_OPTION_PIC support. */
- /* 3. Comment out the corresponding modules in `modules.cfg'. */
- /* 4. Compile. */
- /* */
-/* #define FT_CONFIG_OPTION_PIC */
-
-
- /*************************************************************************/
/*************************************************************************/
/**** ****/
/**** S F N T D R I V E R C O N F I G U R A T I O N ****/
@@ -531,6 +506,15 @@
/*************************************************************************/
/* */
+ /* Define TT_CONFIG_OPTION_COLOR_LAYERS if you want to support coloured */
+ /* outlines (from the COLR/CPAL tables) in all formats using the SFNT */
+ /* module (namely TrueType & OpenType). */
+ /* */
+#define TT_CONFIG_OPTION_COLOR_LAYERS
+
+
+ /*************************************************************************/
+ /* */
/* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
/* load and enumerate the glyph Postscript names in a TrueType or */
/* OpenType file. */