summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--third_party/freetype/README.pdfium4
-rw-r--r--third_party/freetype/include/freetype-custom-config/ftoption.h38
3 files changed, 14 insertions, 30 deletions
diff --git a/DEPS b/DEPS
index 19c749f276..5a90ef0545 100644
--- a/DEPS
+++ b/DEPS
@@ -22,7 +22,7 @@ vars = {
'code_coverage_revision': '64186cbaf924329bfa0d139c0a45946cc529af1f',
'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df',
'depot_tools_revision': '02d53403125b2669236fd0db69f71f7e332c5767',
- 'freetype_revision': '2c8e6279a7bfc314f3934bc8d126ecb1e5e284f1',
+ 'freetype_revision': 'f8af8fba78ac7180674ac05493b8afed7e055cf9',
'gtest_revision': 'd5266326752f0a1dadbd310932d8f4fd8c3c5e7d',
'icu_revision': 'c56c671998902fcc4fc9ace88c83daa99f980793',
'instrumented_lib_revision': '323cf32193caecbf074d1a0cb5b02b905f163e0f',
diff --git a/third_party/freetype/README.pdfium b/third_party/freetype/README.pdfium
index 9d15e75adf..507922bd1d 100644
--- a/third_party/freetype/README.pdfium
+++ b/third_party/freetype/README.pdfium
@@ -1,7 +1,7 @@
Name: FreeType
URL: http://www.freetype.org/
-Version: VER-2-9-1-204
-Revision: 2c8e6279a7bfc314f3934bc8d126ecb1e5e284f1
+Version: VER-2-9-1-238
+Revision: f8af8fba78ac7180674ac05493b8afed7e055cf9
Security Critical: yes
License: FreeType License (FTL)
License File: FTL.TXT
diff --git a/third_party/freetype/include/freetype-custom-config/ftoption.h b/third_party/freetype/include/freetype-custom-config/ftoption.h
index b986473fdc..d3f43a0e3f 100644
--- a/third_party/freetype/include/freetype-custom-config/ftoption.h
+++ b/third_party/freetype/include/freetype-custom-config/ftoption.h
@@ -512,33 +512,17 @@ FT_BEGIN_HEADER
#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
- /*************************************************************************/
- /* */
- /* 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 */
+ /**************************************************************************
+ *
+ * Error Strings
+ *
+ * If this macro is set, `FT_Error_String` will return meaningful
+ * descriptions. This is not enabled by default to reduce the overall
+ * size of FreeType.
+ *
+ * More details can be found in the file `fterrors.h`.
+ */
+/* #define FT_CONFIG_OPTION_ERROR_STRINGS */
/*************************************************************************/