Pull sfntly from GitHub instead of code.google.com.

- Pick up latest release
- Adjust build files
- Update README.chromium

BUG=497302

Review URL: https://codereview.chromium.org/1367323002

Cr-Commit-Position: refs/heads/master@{#351207}

DEPS

@@ -32,8 +32,17 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   'googlecode_url': 'http://%s.googlecode.com/svn',
   'chromium_git': 'https://chromium.googlesource.com',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling libvpx
+  # and whatever else without interference from each other.
   'libvpx_revision': 'b33794b9132c8c1722206d6676c37177ccbaef2e',
-  'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling sfntly
+  # and whatever else without interference from each other.
+  'sfntly_revision': '130f832eddf98467e6578b548cb74ce17d04a26d',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling Skia
+  # and whatever else without interference from each other.
   'skia_revision': 'c9e190ddac3d193e89e580ea3819a55c28f15e61',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
@@ -157,8 +166,8 @@ deps = {
   'src/native_client':
    Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'),
 
-  'src/third_party/sfntly/cpp/src':
-    Var('chromium_git') + '/external/sfntly/cpp/src.git' + '@' +  Var('sfntly_revision'),
+  'src/third_party/sfntly/src':
+   Var('chromium_git') + '/external/github.com/googlei18n/sfntly.git' + '@' + Var('sfntly_revision'),
 
   'src/third_party/skia':
    Var('chromium_git') + '/skia.git' + '@' +  Var('skia_revision'),

skia/config/SkUserConfig.h

@@ -90,7 +90,7 @@
     PDF documents.
  */
 #define SK_SFNTLY_SUBSETTER \
-    "third_party/sfntly/cpp/src/sample/chromium/font_subsetter.h"
+    "third_party/sfntly/src/cpp/src/sample/chromium/font_subsetter.h"
 
 /*  To write debug messages to a console, skia will call SkDebugf(...) following
     printf conventions (e.g. const char* format, ...). If you want to redirect

third_party/sfntly/BUILD.gn

@@ -4,126 +4,123 @@
 
 static_library("sfntly") {
   sources = [
-    "cpp/src/sample/chromium/font_subsetter.cc",
-    "cpp/src/sample/chromium/font_subsetter.h",
-    "cpp/src/sample/chromium/subsetter_impl.cc",
-    "cpp/src/sample/chromium/subsetter_impl.h",
-    "cpp/src/sfntly/data/byte_array.cc",
-    "cpp/src/sfntly/data/byte_array.h",
-    "cpp/src/sfntly/data/font_data.cc",
-    "cpp/src/sfntly/data/font_data.h",
-    "cpp/src/sfntly/data/font_input_stream.cc",
-    "cpp/src/sfntly/data/font_input_stream.h",
-    "cpp/src/sfntly/data/font_output_stream.cc",
-    "cpp/src/sfntly/data/font_output_stream.h",
-    "cpp/src/sfntly/data/growable_memory_byte_array.cc",
-    "cpp/src/sfntly/data/growable_memory_byte_array.h",
-    "cpp/src/sfntly/data/memory_byte_array.cc",
-    "cpp/src/sfntly/data/memory_byte_array.h",
-    "cpp/src/sfntly/data/readable_font_data.cc",
-    "cpp/src/sfntly/data/readable_font_data.h",
-    "cpp/src/sfntly/data/writable_font_data.cc",
-    "cpp/src/sfntly/data/writable_font_data.h",
-    "cpp/src/sfntly/font.cc",
-    "cpp/src/sfntly/font.h",
-    "cpp/src/sfntly/font_factory.cc",
-    "cpp/src/sfntly/font_factory.h",
-    "cpp/src/sfntly/math/fixed1616.h",
-    "cpp/src/sfntly/math/font_math.h",
-    "cpp/src/sfntly/port/atomic.h",
-    "cpp/src/sfntly/port/config.h",
-    "cpp/src/sfntly/port/endian.h",
-    "cpp/src/sfntly/port/exception_type.h",
-    "cpp/src/sfntly/port/file_input_stream.cc",
-    "cpp/src/sfntly/port/file_input_stream.h",
-    "cpp/src/sfntly/port/input_stream.h",
-    "cpp/src/sfntly/port/lock.cc",
-    "cpp/src/sfntly/port/lock.h",
-    "cpp/src/sfntly/port/memory_input_stream.cc",
-    "cpp/src/sfntly/port/memory_input_stream.h",
-    "cpp/src/sfntly/port/memory_output_stream.cc",
-    "cpp/src/sfntly/port/memory_output_stream.h",
-    "cpp/src/sfntly/port/output_stream.h",
-    "cpp/src/sfntly/port/refcount.h",
-    "cpp/src/sfntly/port/type.h",
-    "cpp/src/sfntly/table/bitmap/big_glyph_metrics.cc",
-    "cpp/src/sfntly/table/bitmap/big_glyph_metrics.h",
-    "cpp/src/sfntly/table/bitmap/bitmap_glyph.cc",
-    "cpp/src/sfntly/table/bitmap/bitmap_glyph.h",
-    "cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc",
-    "cpp/src/sfntly/table/bitmap/bitmap_glyph_info.h",
-    "cpp/src/sfntly/table/bitmap/bitmap_size_table.cc",
-    "cpp/src/sfntly/table/bitmap/bitmap_size_table.h",
-    "cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.cc",
-    "cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.h",
-    "cpp/src/sfntly/table/bitmap/ebdt_table.cc",
-    "cpp/src/sfntly/table/bitmap/ebdt_table.h",
-    "cpp/src/sfntly/table/bitmap/eblc_table.cc",
-    "cpp/src/sfntly/table/bitmap/eblc_table.h",
-    "cpp/src/sfntly/table/bitmap/ebsc_table.cc",
-    "cpp/src/sfntly/table/bitmap/ebsc_table.h",
-    "cpp/src/sfntly/table/bitmap/glyph_metrics.cc",
-    "cpp/src/sfntly/table/bitmap/glyph_metrics.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format1.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format1.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format2.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format2.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format3.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format3.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format4.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format4.h",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format5.cc",
-    "cpp/src/sfntly/table/bitmap/index_sub_table_format5.h",
-    "cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.cc",
-    "cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.h",
-    "cpp/src/sfntly/table/bitmap/small_glyph_metrics.cc",
-    "cpp/src/sfntly/table/bitmap/small_glyph_metrics.h",
-    "cpp/src/sfntly/table/byte_array_table_builder.cc",
-    "cpp/src/sfntly/table/byte_array_table_builder.h",
-    "cpp/src/sfntly/table/core/cmap_table.cc",
-    "cpp/src/sfntly/table/core/cmap_table.h",
-    "cpp/src/sfntly/table/core/font_header_table.cc",
-    "cpp/src/sfntly/table/core/font_header_table.h",
-    "cpp/src/sfntly/table/core/horizontal_device_metrics_table.cc",
-    "cpp/src/sfntly/table/core/horizontal_device_metrics_table.h",
-    "cpp/src/sfntly/table/core/horizontal_header_table.cc",
-    "cpp/src/sfntly/table/core/horizontal_header_table.h",
-    "cpp/src/sfntly/table/core/horizontal_metrics_table.cc",
-    "cpp/src/sfntly/table/core/horizontal_metrics_table.h",
-    "cpp/src/sfntly/table/core/maximum_profile_table.cc",
-    "cpp/src/sfntly/table/core/maximum_profile_table.h",
-    "cpp/src/sfntly/table/core/name_table.cc",
-    "cpp/src/sfntly/table/core/name_table.h",
-    "cpp/src/sfntly/table/core/os2_table.cc",
-    "cpp/src/sfntly/table/core/os2_table.h",
-    "cpp/src/sfntly/table/font_data_table.cc",
-    "cpp/src/sfntly/table/font_data_table.h",
-    "cpp/src/sfntly/table/generic_table_builder.cc",
-    "cpp/src/sfntly/table/generic_table_builder.h",
-    "cpp/src/sfntly/table/header.cc",
-    "cpp/src/sfntly/table/header.h",
-    "cpp/src/sfntly/table/subtable.cc",
-    "cpp/src/sfntly/table/subtable.h",
-    "cpp/src/sfntly/table/subtable_container_table.h",
-    "cpp/src/sfntly/table/table.cc",
-    "cpp/src/sfntly/table/table.h",
-    "cpp/src/sfntly/table/table_based_table_builder.cc",
-    "cpp/src/sfntly/table/table_based_table_builder.h",
-    "cpp/src/sfntly/table/truetype/glyph_table.cc",
-    "cpp/src/sfntly/table/truetype/glyph_table.h",
-    "cpp/src/sfntly/table/truetype/loca_table.cc",
-    "cpp/src/sfntly/table/truetype/loca_table.h",
-    "cpp/src/sfntly/tag.cc",
-    "cpp/src/sfntly/tag.h",
+    "src/cpp/src/sample/chromium/font_subsetter.cc",
+    "src/cpp/src/sample/chromium/font_subsetter.h",
+    "src/cpp/src/sample/chromium/subsetter_impl.cc",
+    "src/cpp/src/sample/chromium/subsetter_impl.h",
+    "src/cpp/src/sfntly/data/byte_array.cc",
+    "src/cpp/src/sfntly/data/byte_array.h",
+    "src/cpp/src/sfntly/data/font_data.cc",
+    "src/cpp/src/sfntly/data/font_data.h",
+    "src/cpp/src/sfntly/data/font_input_stream.cc",
+    "src/cpp/src/sfntly/data/font_input_stream.h",
+    "src/cpp/src/sfntly/data/font_output_stream.cc",
+    "src/cpp/src/sfntly/data/font_output_stream.h",
+    "src/cpp/src/sfntly/data/growable_memory_byte_array.cc",
+    "src/cpp/src/sfntly/data/growable_memory_byte_array.h",
+    "src/cpp/src/sfntly/data/memory_byte_array.cc",
+    "src/cpp/src/sfntly/data/memory_byte_array.h",
+    "src/cpp/src/sfntly/data/readable_font_data.cc",
+    "src/cpp/src/sfntly/data/readable_font_data.h",
+    "src/cpp/src/sfntly/data/writable_font_data.cc",
+    "src/cpp/src/sfntly/data/writable_font_data.h",
+    "src/cpp/src/sfntly/font.cc",
+    "src/cpp/src/sfntly/font.h",
+    "src/cpp/src/sfntly/font_factory.cc",
+    "src/cpp/src/sfntly/font_factory.h",
+    "src/cpp/src/sfntly/math/fixed1616.h",
+    "src/cpp/src/sfntly/math/font_math.h",
+    "src/cpp/src/sfntly/port/atomic.h",
+    "src/cpp/src/sfntly/port/config.h",
+    "src/cpp/src/sfntly/port/endian.h",
+    "src/cpp/src/sfntly/port/exception_type.h",
+    "src/cpp/src/sfntly/port/file_input_stream.cc",
+    "src/cpp/src/sfntly/port/file_input_stream.h",
+    "src/cpp/src/sfntly/port/input_stream.h",
+    "src/cpp/src/sfntly/port/lock.cc",
+    "src/cpp/src/sfntly/port/lock.h",
+    "src/cpp/src/sfntly/port/memory_input_stream.cc",
+    "src/cpp/src/sfntly/port/memory_input_stream.h",
+    "src/cpp/src/sfntly/port/memory_output_stream.cc",
+    "src/cpp/src/sfntly/port/memory_output_stream.h",
+    "src/cpp/src/sfntly/port/output_stream.h",
+    "src/cpp/src/sfntly/port/refcount.h",
+    "src/cpp/src/sfntly/port/type.h",
+    "src/cpp/src/sfntly/table/bitmap/big_glyph_metrics.cc",
+    "src/cpp/src/sfntly/table/bitmap/big_glyph_metrics.h",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_glyph.cc",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_glyph.h",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.h",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_size_table.cc",
+    "src/cpp/src/sfntly/table/bitmap/bitmap_size_table.h",
+    "src/cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.cc",
+    "src/cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.h",
+    "src/cpp/src/sfntly/table/bitmap/ebdt_table.cc",
+    "src/cpp/src/sfntly/table/bitmap/ebdt_table.h",
+    "src/cpp/src/sfntly/table/bitmap/eblc_table.cc",
+    "src/cpp/src/sfntly/table/bitmap/eblc_table.h",
+    "src/cpp/src/sfntly/table/bitmap/ebsc_table.cc",
+    "src/cpp/src/sfntly/table/bitmap/ebsc_table.h",
+    "src/cpp/src/sfntly/table/bitmap/glyph_metrics.cc",
+    "src/cpp/src/sfntly/table/bitmap/glyph_metrics.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format1.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format1.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format2.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format2.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format3.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format3.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format4.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format4.h",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format5.cc",
+    "src/cpp/src/sfntly/table/bitmap/index_sub_table_format5.h",
+    "src/cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.cc",
+    "src/cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.h",
+    "src/cpp/src/sfntly/table/bitmap/small_glyph_metrics.cc",
+    "src/cpp/src/sfntly/table/bitmap/small_glyph_metrics.h",
+    "src/cpp/src/sfntly/table/byte_array_table_builder.cc",
+    "src/cpp/src/sfntly/table/byte_array_table_builder.h",
+    "src/cpp/src/sfntly/table/core/cmap_table.cc",
+    "src/cpp/src/sfntly/table/core/cmap_table.h",
+    "src/cpp/src/sfntly/table/core/font_header_table.cc",
+    "src/cpp/src/sfntly/table/core/font_header_table.h",
+    "src/cpp/src/sfntly/table/core/horizontal_device_metrics_table.cc",
+    "src/cpp/src/sfntly/table/core/horizontal_device_metrics_table.h",
+    "src/cpp/src/sfntly/table/core/horizontal_header_table.cc",
+    "src/cpp/src/sfntly/table/core/horizontal_header_table.h",
+    "src/cpp/src/sfntly/table/core/horizontal_metrics_table.cc",
+    "src/cpp/src/sfntly/table/core/horizontal_metrics_table.h",
+    "src/cpp/src/sfntly/table/core/maximum_profile_table.cc",
+    "src/cpp/src/sfntly/table/core/maximum_profile_table.h",
+    "src/cpp/src/sfntly/table/core/name_table.cc",
+    "src/cpp/src/sfntly/table/core/name_table.h",
+    "src/cpp/src/sfntly/table/core/os2_table.cc",
+    "src/cpp/src/sfntly/table/core/os2_table.h",
+    "src/cpp/src/sfntly/table/font_data_table.cc",
+    "src/cpp/src/sfntly/table/font_data_table.h",
+    "src/cpp/src/sfntly/table/generic_table_builder.cc",
+    "src/cpp/src/sfntly/table/generic_table_builder.h",
+    "src/cpp/src/sfntly/table/header.cc",
+    "src/cpp/src/sfntly/table/header.h",
+    "src/cpp/src/sfntly/table/subtable.cc",
+    "src/cpp/src/sfntly/table/subtable.h",
+    "src/cpp/src/sfntly/table/subtable_container_table.h",
+    "src/cpp/src/sfntly/table/table.cc",
+    "src/cpp/src/sfntly/table/table.h",
+    "src/cpp/src/sfntly/table/table_based_table_builder.cc",
+    "src/cpp/src/sfntly/table/table_based_table_builder.h",
+    "src/cpp/src/sfntly/table/truetype/glyph_table.cc",
+    "src/cpp/src/sfntly/table/truetype/glyph_table.h",
+    "src/cpp/src/sfntly/table/truetype/loca_table.cc",
+    "src/cpp/src/sfntly/table/truetype/loca_table.h",
+    "src/cpp/src/sfntly/tag.cc",
+    "src/cpp/src/sfntly/tag.h",
   ]
 
   defines = [ "SFNTLY_NO_EXCEPTION" ]
-  include_dirs = [ "cpp/src" ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  include_dirs = [ "src/cpp/src" ]
 
   deps = [
     "//third_party/icu:icuuc",

third_party/sfntly/README.chromium

 Name: sfntly
-URL: http://code.google.com/p/sfntly/
-Version: unknown
-Revision: 111
+URL: https://github.com/googlei18n/sfntly
+Version: 130f832eddf98467e6578b548cb74ce17d04a26d
 Security Critical: yes
 License: Apache 2.0
 License File: COPYING.txt
@@ -12,9 +11,4 @@ fonts (e.g. OpenType, TrueType).  We use it to subset the embedded font in the
 PDF generated in print preview so that the result PDF documents are
 significantly smaller and loaded faster.
 
-Local files (not taken from upstream):
-README.chromium
-src/subsetter/*
-
 COPYING.txt is the license file copied from upstream.
-A sfntly.gyp file has been added for building with Chromium.

third_party/sfntly/sfntly.gyp

@@ -11,122 +11,122 @@
       'target_name': 'sfntly',
       'type': 'static_library',
       'sources': [
-        'cpp/src/sfntly/data/byte_array.cc',
-        'cpp/src/sfntly/data/byte_array.h',
-        'cpp/src/sfntly/data/font_data.cc',
-        'cpp/src/sfntly/data/font_data.h',
-        'cpp/src/sfntly/data/font_input_stream.cc',
-        'cpp/src/sfntly/data/font_input_stream.h',
-        'cpp/src/sfntly/data/font_output_stream.cc',
-        'cpp/src/sfntly/data/font_output_stream.h',
-        'cpp/src/sfntly/data/growable_memory_byte_array.cc',
-        'cpp/src/sfntly/data/growable_memory_byte_array.h',
-        'cpp/src/sfntly/data/memory_byte_array.cc',
-        'cpp/src/sfntly/data/memory_byte_array.h',
-        'cpp/src/sfntly/data/readable_font_data.cc',
-        'cpp/src/sfntly/data/readable_font_data.h',
-        'cpp/src/sfntly/data/writable_font_data.cc',
-        'cpp/src/sfntly/data/writable_font_data.h',
-        'cpp/src/sfntly/font.cc',
-        'cpp/src/sfntly/font.h',
-        'cpp/src/sfntly/font_factory.cc',
-        'cpp/src/sfntly/font_factory.h',
-        'cpp/src/sfntly/math/fixed1616.h',
-        'cpp/src/sfntly/math/font_math.h',
-        'cpp/src/sfntly/port/atomic.h',
-        'cpp/src/sfntly/port/config.h',
-        'cpp/src/sfntly/port/endian.h',
-        'cpp/src/sfntly/port/exception_type.h',
-        'cpp/src/sfntly/port/file_input_stream.cc',
-        'cpp/src/sfntly/port/file_input_stream.h',
-        'cpp/src/sfntly/port/input_stream.h',
-        'cpp/src/sfntly/port/lock.cc',
-        'cpp/src/sfntly/port/lock.h',
-        'cpp/src/sfntly/port/memory_input_stream.cc',
-        'cpp/src/sfntly/port/memory_input_stream.h',
-        'cpp/src/sfntly/port/memory_output_stream.cc',
-        'cpp/src/sfntly/port/memory_output_stream.h',
-        'cpp/src/sfntly/port/output_stream.h',
-        'cpp/src/sfntly/port/refcount.h',
-        'cpp/src/sfntly/port/type.h',
-        'cpp/src/sfntly/table/bitmap/big_glyph_metrics.cc',
-        'cpp/src/sfntly/table/bitmap/big_glyph_metrics.h',
-        'cpp/src/sfntly/table/bitmap/bitmap_glyph.cc',
-        'cpp/src/sfntly/table/bitmap/bitmap_glyph.h',
-        'cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc',
-        'cpp/src/sfntly/table/bitmap/bitmap_glyph_info.h',
-        'cpp/src/sfntly/table/bitmap/bitmap_size_table.cc',
-        'cpp/src/sfntly/table/bitmap/bitmap_size_table.h',
-        'cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.cc',
-        'cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.h',
-        'cpp/src/sfntly/table/bitmap/ebdt_table.cc',
-        'cpp/src/sfntly/table/bitmap/ebdt_table.h',
-        'cpp/src/sfntly/table/bitmap/eblc_table.cc',
-        'cpp/src/sfntly/table/bitmap/eblc_table.h',
-        'cpp/src/sfntly/table/bitmap/ebsc_table.cc',
-        'cpp/src/sfntly/table/bitmap/ebsc_table.h',
-        'cpp/src/sfntly/table/bitmap/glyph_metrics.cc',
-        'cpp/src/sfntly/table/bitmap/glyph_metrics.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format1.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format1.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format2.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format2.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format3.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format3.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format4.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format4.h',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format5.cc',
-        'cpp/src/sfntly/table/bitmap/index_sub_table_format5.h',
-        'cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.cc',
-        'cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.h',
-        'cpp/src/sfntly/table/bitmap/small_glyph_metrics.cc',
-        'cpp/src/sfntly/table/bitmap/small_glyph_metrics.h',
-        'cpp/src/sfntly/table/byte_array_table_builder.cc',
-        'cpp/src/sfntly/table/byte_array_table_builder.h',
-        'cpp/src/sfntly/table/core/cmap_table.cc',
-        'cpp/src/sfntly/table/core/cmap_table.h',
-        'cpp/src/sfntly/table/core/font_header_table.cc',
-        'cpp/src/sfntly/table/core/font_header_table.h',
-        'cpp/src/sfntly/table/core/horizontal_device_metrics_table.cc',
-        'cpp/src/sfntly/table/core/horizontal_device_metrics_table.h',
-        'cpp/src/sfntly/table/core/horizontal_header_table.cc',
-        'cpp/src/sfntly/table/core/horizontal_header_table.h',
-        'cpp/src/sfntly/table/core/horizontal_metrics_table.cc',
-        'cpp/src/sfntly/table/core/horizontal_metrics_table.h',
-        'cpp/src/sfntly/table/core/maximum_profile_table.cc',
-        'cpp/src/sfntly/table/core/maximum_profile_table.h',
-        'cpp/src/sfntly/table/core/name_table.cc',
-        'cpp/src/sfntly/table/core/name_table.h',
-        'cpp/src/sfntly/table/core/os2_table.cc',
-        'cpp/src/sfntly/table/core/os2_table.h',
-        'cpp/src/sfntly/table/font_data_table.cc',
-        'cpp/src/sfntly/table/font_data_table.h',
-        'cpp/src/sfntly/table/generic_table_builder.cc',
-        'cpp/src/sfntly/table/generic_table_builder.h',
-        'cpp/src/sfntly/table/header.cc',
-        'cpp/src/sfntly/table/header.h',
-        'cpp/src/sfntly/table/subtable.cc',
-        'cpp/src/sfntly/table/subtable.h',
-        'cpp/src/sfntly/table/subtable_container_table.h',
-        'cpp/src/sfntly/table/table.cc',
-        'cpp/src/sfntly/table/table.h',
-        'cpp/src/sfntly/table/table_based_table_builder.cc',
-        'cpp/src/sfntly/table/table_based_table_builder.h',
-        'cpp/src/sfntly/table/truetype/glyph_table.cc',
-        'cpp/src/sfntly/table/truetype/glyph_table.h',
-        'cpp/src/sfntly/table/truetype/loca_table.cc',
-        'cpp/src/sfntly/table/truetype/loca_table.h',
-        'cpp/src/sfntly/tag.cc',
-        'cpp/src/sfntly/tag.h',
-        'cpp/src/sample/chromium/font_subsetter.cc',
-        'cpp/src/sample/chromium/font_subsetter.h',
-        'cpp/src/sample/chromium/subsetter_impl.cc',
-        'cpp/src/sample/chromium/subsetter_impl.h',
+        'src/cpp/src/sfntly/data/byte_array.cc',
+        'src/cpp/src/sfntly/data/byte_array.h',
+        'src/cpp/src/sfntly/data/font_data.cc',
+        'src/cpp/src/sfntly/data/font_data.h',
+        'src/cpp/src/sfntly/data/font_input_stream.cc',
+        'src/cpp/src/sfntly/data/font_input_stream.h',
+        'src/cpp/src/sfntly/data/font_output_stream.cc',
+        'src/cpp/src/sfntly/data/font_output_stream.h',
+        'src/cpp/src/sfntly/data/growable_memory_byte_array.cc',
+        'src/cpp/src/sfntly/data/growable_memory_byte_array.h',
+        'src/cpp/src/sfntly/data/memory_byte_array.cc',
+        'src/cpp/src/sfntly/data/memory_byte_array.h',
+        'src/cpp/src/sfntly/data/readable_font_data.cc',
+        'src/cpp/src/sfntly/data/readable_font_data.h',
+        'src/cpp/src/sfntly/data/writable_font_data.cc',
+        'src/cpp/src/sfntly/data/writable_font_data.h',
+        'src/cpp/src/sfntly/font.cc',
+        'src/cpp/src/sfntly/font.h',
+        'src/cpp/src/sfntly/font_factory.cc',
+        'src/cpp/src/sfntly/font_factory.h',
+        'src/cpp/src/sfntly/math/fixed1616.h',
+        'src/cpp/src/sfntly/math/font_math.h',
+        'src/cpp/src/sfntly/port/atomic.h',
+        'src/cpp/src/sfntly/port/config.h',
+        'src/cpp/src/sfntly/port/endian.h',
+        'src/cpp/src/sfntly/port/exception_type.h',
+        'src/cpp/src/sfntly/port/file_input_stream.cc',
+        'src/cpp/src/sfntly/port/file_input_stream.h',
+        'src/cpp/src/sfntly/port/input_stream.h',
+        'src/cpp/src/sfntly/port/lock.cc',
+        'src/cpp/src/sfntly/port/lock.h',
+        'src/cpp/src/sfntly/port/memory_input_stream.cc',
+        'src/cpp/src/sfntly/port/memory_input_stream.h',
+        'src/cpp/src/sfntly/port/memory_output_stream.cc',
+        'src/cpp/src/sfntly/port/memory_output_stream.h',
+        'src/cpp/src/sfntly/port/output_stream.h',
+        'src/cpp/src/sfntly/port/refcount.h',
+        'src/cpp/src/sfntly/port/type.h',
+        'src/cpp/src/sfntly/table/bitmap/big_glyph_metrics.cc',
+        'src/cpp/src/sfntly/table/bitmap/big_glyph_metrics.h',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_glyph.cc',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_glyph.h',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.cc',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_glyph_info.h',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_size_table.cc',
+        'src/cpp/src/sfntly/table/bitmap/bitmap_size_table.h',
+        'src/cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.cc',
+        'src/cpp/src/sfntly/table/bitmap/composite_bitmap_glyph.h',
+        'src/cpp/src/sfntly/table/bitmap/ebdt_table.cc',
+        'src/cpp/src/sfntly/table/bitmap/ebdt_table.h',
+        'src/cpp/src/sfntly/table/bitmap/eblc_table.cc',
+        'src/cpp/src/sfntly/table/bitmap/eblc_table.h',
+        'src/cpp/src/sfntly/table/bitmap/ebsc_table.cc',
+        'src/cpp/src/sfntly/table/bitmap/ebsc_table.h',
+        'src/cpp/src/sfntly/table/bitmap/glyph_metrics.cc',
+        'src/cpp/src/sfntly/table/bitmap/glyph_metrics.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format1.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format1.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format2.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format2.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format3.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format3.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format4.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format4.h',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format5.cc',
+        'src/cpp/src/sfntly/table/bitmap/index_sub_table_format5.h',
+        'src/cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.cc',
+        'src/cpp/src/sfntly/table/bitmap/simple_bitmap_glyph.h',
+        'src/cpp/src/sfntly/table/bitmap/small_glyph_metrics.cc',
+        'src/cpp/src/sfntly/table/bitmap/small_glyph_metrics.h',
+        'src/cpp/src/sfntly/table/byte_array_table_builder.cc',
+        'src/cpp/src/sfntly/table/byte_array_table_builder.h',
+        'src/cpp/src/sfntly/table/core/cmap_table.cc',
+        'src/cpp/src/sfntly/table/core/cmap_table.h',
+        'src/cpp/src/sfntly/table/core/font_header_table.cc',
+        'src/cpp/src/sfntly/table/core/font_header_table.h',
+        'src/cpp/src/sfntly/table/core/horizontal_device_metrics_table.cc',
+        'src/cpp/src/sfntly/table/core/horizontal_device_metrics_table.h',
+        'src/cpp/src/sfntly/table/core/horizontal_header_table.cc',
+        'src/cpp/src/sfntly/table/core/horizontal_header_table.h',
+        'src/cpp/src/sfntly/table/core/horizontal_metrics_table.cc',
+        'src/cpp/src/sfntly/table/core/horizontal_metrics_table.h',
+        'src/cpp/src/sfntly/table/core/maximum_profile_table.cc',
+        'src/cpp/src/sfntly/table/core/maximum_profile_table.h',
+        'src/cpp/src/sfntly/table/core/name_table.cc',
+        'src/cpp/src/sfntly/table/core/name_table.h',
+        'src/cpp/src/sfntly/table/core/os2_table.cc',
+        'src/cpp/src/sfntly/table/core/os2_table.h',
+        'src/cpp/src/sfntly/table/font_data_table.cc',
+        'src/cpp/src/sfntly/table/font_data_table.h',
+        'src/cpp/src/sfntly/table/generic_table_builder.cc',
+        'src/cpp/src/sfntly/table/generic_table_builder.h',
+        'src/cpp/src/sfntly/table/header.cc',
+        'src/cpp/src/sfntly/table/header.h',
+        'src/cpp/src/sfntly/table/subtable.cc',
+        'src/cpp/src/sfntly/table/subtable.h',
+        'src/cpp/src/sfntly/table/subtable_container_table.h',
+        'src/cpp/src/sfntly/table/table.cc',
+        'src/cpp/src/sfntly/table/table.h',
+        'src/cpp/src/sfntly/table/table_based_table_builder.cc',
+        'src/cpp/src/sfntly/table/table_based_table_builder.h',
+        'src/cpp/src/sfntly/table/truetype/glyph_table.cc',
+        'src/cpp/src/sfntly/table/truetype/glyph_table.h',
+        'src/cpp/src/sfntly/table/truetype/loca_table.cc',
+        'src/cpp/src/sfntly/table/truetype/loca_table.h',
+        'src/cpp/src/sfntly/tag.cc',
+        'src/cpp/src/sfntly/tag.h',
+        'src/cpp/src/sample/chromium/font_subsetter.cc',
+        'src/cpp/src/sample/chromium/font_subsetter.h',
+        'src/cpp/src/sample/chromium/subsetter_impl.cc',
+        'src/cpp/src/sample/chromium/subsetter_impl.h',
       ],
       'include_dirs': [
-        'cpp/src', '../..',
+        'src/cpp/src',
       ],
       # This macro must be define to suppress the use of exception
       'defines': [

tools/checklicenses/checklicenses.py

@@ -428,6 +428,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'third_party/scons-2.0.1/engine/SCons': [  # http://crbug.com/98462
         'UNKNOWN',
     ],
+    'third_party/sfntly/src/java': [  # Apache 2.0, not shipped.
+        'UNKNOWN',
+    ],
     'third_party/simplejson': [
         'UNKNOWN',
     ],