Merge to XFA: Update bundled freetype to 2.6.1

third_party/BUILD.gn

 # Copyright 2014 PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 group("third_party") {
   deps = [
     ":bigint",
     ":fx_freetype",
     ":pdfium_base",
   ]
@@ skipping 31 matching lines @@
 source_set("fx_freetype") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":fx_freetype_warnings",
   ]
   defines = [ "FT2_BUILD_LIBRARY" ]
   sources = [
-    "freetype/include/freetype.h",
+    "freetype/include/freetype/freetype.h",
+    "freetype/include/freetype/ftmm.h",
+    "freetype/include/freetype/ftotval.h",
+    "freetype/include/freetype/ftoutln.h",
+    "freetype/include/freetype/internal/ftobjs.h",
+    "freetype/include/freetype/internal/ftstream.h",
+    "freetype/include/freetype/internal/tttypes.h",
+    "freetype/include/freetype/tttables.h",
     "freetype/include/ft2build.h",
-    "freetype/include/ftmm.h",
-    "freetype/include/ftotval.h",
-    "freetype/include/ftoutln.h",
-    "freetype/include/tttables.h",
-    "freetype/include/internal/ftobjs.h",
-    "freetype/include/internal/ftstream.h",
-    "freetype/include/internal/tttypes.h",
-    "freetype/src/cff/cffobjs.h",
-    "freetype/src/cff/cfftypes.h",
-    "freetype/src/cff/cff.c",
     "freetype/src/base/ftbase.c",
+    "freetype/src/base/ftbase.h",
     "freetype/src/base/ftbitmap.c",
     "freetype/src/base/ftglyph.c",
     "freetype/src/base/ftinit.c",
     "freetype/src/base/ftlcdfil.c",
     "freetype/src/base/ftmm.c",
     "freetype/src/base/ftsystem.c",
+    "freetype/src/cff/cff.c",
+    "freetype/src/cff/cffobjs.h",
+    "freetype/src/cff/cfftypes.h",
+    "freetype/src/cid/type1cid.c",
     "freetype/src/psaux/psaux.c",
     "freetype/src/pshinter/pshinter.c",
     "freetype/src/psnames/psmodule.c",
     "freetype/src/raster/raster.c",
     "freetype/src/sfnt/sfnt.c",
     "freetype/src/smooth/smooth.c",
     "freetype/src/truetype/truetype.c",
     "freetype/src/type1/type1.c",
-    "freetype/src/cid/type1cid.c",
   ]
 }
 
 config("fx_agg_warnings") {
   visibility = [ ":*" ]
   if (is_clang) {
     # calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
     cflags = [ "-Wno-unused-function" ]
   }
 }
@@ skipping 274 matching lines @@
     "base/macros.h",
     "base/nonstd_unique_ptr.h",
     "base/numerics/safe_conversions.h",
     "base/numerics/safe_conversions_impl.h",
     "base/numerics/safe_math.h",
     "base/numerics/safe_math_impl.h",
     "base/stl_util.h",
     "base/template_util.h",
   ]
 }