Roll sfntly 111

third_party/sfntly/src/subsetter/subsetter_impl.h

Index: third_party/sfntly/src/subsetter/subsetter_impl.h
diff --git a/third_party/sfntly/src/subsetter/subsetter_impl.h b/third_party/sfntly/src/subsetter/subsetter_impl.h
index 7f27250cf7cce96012bd16b7cc51e883729ad18c..ebb9203a5275a15d919d21e689b5a1f4370e8d16 100644
--- a/third_party/sfntly/src/subsetter/subsetter_impl.h
+++ b/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_;