Roll sfntly 111

BUG=90898
TEST=none


Review URL: http://codereview.chromium.org/8744002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112852 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -33,7 +33,7 @@ vars = {
   "libjingle_revision": "95",
   "libvpx_revision": "109236",
   "ffmpeg_revision": "112050",
-  "sfntly_revision": "98",
+  "sfntly_revision": "111",
   "skia_revision": "2785",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia

third_party/sfntly/README.chromium

 Name: sfntly
 URL: http://code.google.com/p/sfntly/
 Version: unknown
-Revision: 9
+Revision: 111
 Security Critical: yes
 
 Description:

third_party/sfntly/sfntly.gyp

@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'chromium_code': 1,
+  },
   'targets': [
     {
       'target_name': 'sfntly',
@@ -46,8 +49,12 @@
         'src/sfntly/port/output_stream.h',
         'src/sfntly/port/refcount.h',
         'src/sfntly/port/type.h',
+        'src/sfntly/table/bitmap/big_glyph_metrics.cc',
+        'src/sfntly/table/bitmap/big_glyph_metrics.h',
         'src/sfntly/table/bitmap/bitmap_glyph.cc',
         'src/sfntly/table/bitmap/bitmap_glyph.h',
+        'src/sfntly/table/bitmap/bitmap_glyph_info.cc',
+        'src/sfntly/table/bitmap/bitmap_glyph_info.h',
         'src/sfntly/table/bitmap/bitmap_size_table.cc',
         'src/sfntly/table/bitmap/bitmap_size_table.h',
         'src/sfntly/table/bitmap/composite_bitmap_glyph.cc',
@@ -56,6 +63,10 @@
         'src/sfntly/table/bitmap/ebdt_table.h',
         'src/sfntly/table/bitmap/eblc_table.cc',
         'src/sfntly/table/bitmap/eblc_table.h',
+        'src/sfntly/table/bitmap/ebsc_table.cc',
+        'src/sfntly/table/bitmap/ebsc_table.h',
+        'src/sfntly/table/bitmap/glyph_metrics.cc',
+        'src/sfntly/table/bitmap/glyph_metrics.h',
         'src/sfntly/table/bitmap/index_sub_table.cc',
         'src/sfntly/table/bitmap/index_sub_table.h',
         'src/sfntly/table/bitmap/index_sub_table_format1.cc',
@@ -70,10 +81,16 @@
         'src/sfntly/table/bitmap/index_sub_table_format5.h',
         'src/sfntly/table/bitmap/simple_bitmap_glyph.cc',
         'src/sfntly/table/bitmap/simple_bitmap_glyph.h',
+        'src/sfntly/table/bitmap/small_glyph_metrics.cc',
+        'src/sfntly/table/bitmap/small_glyph_metrics.h',
+        'src/sfntly/table/byte_array_table_builder.cc',
+        'src/sfntly/table/byte_array_table_builder.h',
         'src/sfntly/table/core/cmap_table.cc',
         'src/sfntly/table/core/cmap_table.h',
         'src/sfntly/table/core/font_header_table.cc',
         'src/sfntly/table/core/font_header_table.h',
+        'src/sfntly/table/core/horizontal_device_metrics_table.cc',
+        'src/sfntly/table/core/horizontal_device_metrics_table.h',
         'src/sfntly/table/core/horizontal_header_table.cc',
         'src/sfntly/table/core/horizontal_header_table.h',
         'src/sfntly/table/core/horizontal_metrics_table.cc',
@@ -86,6 +103,8 @@
         'src/sfntly/table/core/os2_table.h',
         'src/sfntly/table/font_data_table.cc',
         'src/sfntly/table/font_data_table.h',
+        'src/sfntly/table/generic_table_builder.cc',
+        'src/sfntly/table/generic_table_builder.h',
         'src/sfntly/table/header.cc',
         'src/sfntly/table/header.h',
         'src/sfntly/table/subtable.cc',

third_party/sfntly/src/subsetter/subsetter_impl.h

@@ -19,6 +19,9 @@
 
 #include "third_party/sfntly/src/sfntly/font.h"
 #include "third_party/sfntly/src/sfntly/font_factory.h"
+#include "third_party/sfntly/src/sfntly/table/truetype/glyph_table.h"
+#include "third_party/sfntly/src/sfntly/table/truetype/loca_table.h"
+#include "third_party/sfntly/src/sfntly/tag.h"
 
 namespace sfntly {
 
@@ -57,12 +60,8 @@ class SubsetterImpl {
                  unsigned char** output_buffer);
 
  private:
-  Font* FindFont(const char* font_name, const FontArray& font_array);
-  bool HasName(const char* font_name, Font* font);
-  bool ResolveCompositeGlyphs(const unsigned int* glyph_ids,
-                              size_t glyph_count,
-                              IntegerSet* glyph_id_processed);
-  CALLER_ATTACH Font* Subset(const IntegerSet& glyph_ids);
+  CALLER_ATTACH Font* Subset(const IntegerSet& glyph_ids,
+                             GlyphTable* glyf, LocaTable* loca);
 
   FontFactoryPtr factory_;
   FontPtr font_;