From 53aa0e95420c5c3bfe8af21cf7956535d35b06e6 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 6 Feb 2018 17:05:22 -0800
Subject: [PATCH] Add an instance of glyf::accelerator_t to hb-subset-glyf.

---
 src/hb-subset-glyf.cc | 13 ++++++++++---
 src/hb-subset-glyf.hh |  2 +-
 src/hb-subset.cc      |  4 +---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/hb-subset-glyf.cc b/src/hb-subset-glyf.cc
index 099f506cf..5a3dff6d9 100644
--- a/src/hb-subset-glyf.cc
+++ b/src/hb-subset-glyf.cc
@@ -24,6 +24,7 @@
  * Google Author(s): Garret Rieger
  */
 
+#include "hb-ot-glyf-table.hh"
 #include "hb-subset-glyf.hh"
 
 /**
@@ -36,10 +37,16 @@
  **/
 bool
 hb_subset_glyf (hb_subset_plan_t *plan,
-                hb_blob_t *glyf,
-                hb_blob_t **glyf_prime /* OUT */)
+                hb_face_t        *face,
+                hb_blob_t       **glyf_prime /* OUT */)
 {
-  *glyf_prime = hb_blob_get_empty ();
+  OT::glyf::accelerator_t glyf_accelerator;
+  glyf_accelerator.init(face);
 
+  // TODO
+
+  glyf_accelerator.fini();
+
+  *glyf_prime = hb_blob_get_empty ();
   return true;
 }
diff --git a/src/hb-subset-glyf.hh b/src/hb-subset-glyf.hh
index 8bb0d8642..fd217e79c 100644
--- a/src/hb-subset-glyf.hh
+++ b/src/hb-subset-glyf.hh
@@ -31,7 +31,7 @@
 
 bool
 hb_subset_glyf (hb_subset_plan_t *plan,
-                hb_blob_t        *glyf,
+                hb_face_t        *face,
                 hb_blob_t       **glyf_prime /* OUT */);
 
 #endif /* HB_SUBSET_GLYF_HH */
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 7108eb871..e8b87ca3f 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -160,15 +160,13 @@ hb_subset (hb_subset_profile_t *profile,
 
   bool success = true;
 
-  hb_blob_t *glyf = hb_face_reference_table (face->face, HB_OT_TAG_glyf);
   hb_blob_t *glyf_prime = nullptr;
-  if (hb_subset_glyf (plan, glyf, &glyf_prime)) {
+  if (hb_subset_glyf (plan, face->face, &glyf_prime)) {
     // TODO: write new glyf to new face.
   } else {
     success = false;
   }
   hb_blob_destroy (glyf_prime);
-  hb_blob_destroy (glyf);
 
   *result = hb_face_reference_blob(face->face);
   hb_subset_plan_destroy (plan);