1 files changed, 3 insertions, 14 deletions
diff --git a/src/pdf/SkClusterator.h b/src/pdf/SkClusterator.h
index 97aded2197..40d9994ba3 100644
--- a/src/pdf/SkClusterator.h
+++ b/src/pdf/SkClusterator.h
@@ -8,21 +8,15 @@
 #define SkClusterator_DEFINED
 
 #include <vector>
+#include <cstdint>
 
-#include "SkTypes.h"
-#include "SkPaint.h"
+class SkGlyphRun;
 
 /** Given the m-to-n glyph-to-character mapping data (as returned by
     harfbuzz), iterate over the clusters. */
 class SkClusterator {
 public:
-    SkClusterator(const void* sourceText,
-                  size_t sourceByteCount,
-                  const SkPaint& paint,
-                  const uint32_t* clusters,
-                  uint32_t utf8TextByteLength,
-                  const char* utf8Text);
-    const SkGlyphID* glyphs() const { return fGlyphs; }
+    SkClusterator(const SkGlyphRun& run);
     uint32_t glyphCount() const { return fGlyphCount; }
     bool reversedChars() const { return fReversedChars; }
     struct Cluster {
@@ -37,15 +31,10 @@ public:
                 && fGlyphIndex     == o.fGlyphIndex
                 && fGlyphCount     == o.fGlyphCount;
         }
-
     };
     Cluster next();
 
 private:
-    std::vector<SkGlyphID> fGlyphStorage;
-    std::vector<char> fUtf8textStorage;
-    std::vector<uint32_t> fClusterStorage;
-    const SkGlyphID* fGlyphs;
     const uint32_t* fClusters;
     const char* fUtf8Text;
     uint32_t fGlyphCount;