SkPDFCanon

src/pdf/SkPDFGraphicState.h

Index: src/pdf/SkPDFGraphicState.h
diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h
index 246f1db26ea07ba0874ef738dc013a942a67b48b..cfc80ff548a621037623dfe5b564a84710a201a5 100644
--- a/src/pdf/SkPDFGraphicState.h
+++ b/src/pdf/SkPDFGraphicState.h
@@ -71,30 +71,14 @@ public:
      */
     static SkPDFGraphicState* GetNoSMaskGraphicState();
 
+    bool equals(const SkPaint&) const;
+
 private:
     const SkPaint fPaint;
     SkTDArray<SkPDFObject*> fResources;
     bool fPopulated;
     bool fSMask;
 
-    class GSCanonicalEntry {
-    public:
-        SkPDFGraphicState* fGraphicState;
-        const SkPaint* fPaint;
-
-        bool operator==(const GSCanonicalEntry& b) const;
-        explicit GSCanonicalEntry(SkPDFGraphicState* gs)
-            : fGraphicState(gs),
-              fPaint(&gs->fPaint) {}
-        explicit GSCanonicalEntry(const SkPaint* paint)
-            : fGraphicState(NULL),
-              fPaint(paint) {}
-    };
-
-    // This should be made a hash table if performance is a problem.
-    static SkTDArray<GSCanonicalEntry>& CanonicalPaints();
-    static SkBaseMutex& CanonicalPaintsMutex();
-
     SkPDFGraphicState();
     explicit SkPDFGraphicState(const SkPaint& paint);
 
@@ -102,7 +86,6 @@ private:
 
     static SkPDFObject* GetInvertFunction();
 
-    static int Find(const SkPaint& paint);
     typedef SkPDFDict INHERITED;
 };