SkPDF: Remove unused deprecated functions in SkPDFTypes

src/pdf/SkPDFTypes.h

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFTypes_DEFINED
 #define SkPDFTypes_DEFINED
@@ skipping 142 matching lines @@
     SkPDFUnion(Type);
     // We do not now need copy constructor and copy assignment, so we
     // will disable this functionality.
     SkPDFUnion& operator=(const SkPDFUnion&) = delete;
     SkPDFUnion(const SkPDFUnion&) = delete;
 };
 SK_COMPILE_ASSERT(sizeof(SkString) == sizeof(void*), SkString_size);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-/**  This class is a SkPDFUnion with SkPDFObject virtuals attached. */
-// TODO(halcanary): 99% of the uses of this class should be
-// transitioned to using a bare SkPDFUnion inside an array or dict.
+#if 0  // Enable if needed.

[tomhudson, 2015/05/04 18:31:54]

... because you're trying to deprecate? *why*?

+/** This class is a SkPDFUnion with SkPDFObject virtuals attached.
+    The only use case of this is when a non-compound PDF object is
+    referenced indirectly. */
 class SkPDFAtom : public SkPDFObject {
 public:
     void emitObject(SkWStream* stream,
                     const SkPDFObjNumMap& objNumMap,
                     const SkPDFSubstituteMap& substitutes) final;
     void addResources(SkPDFObjNumMap*, const SkPDFSubstituteMap&) const final;
-
-protected:
     SkPDFAtom(SkPDFUnion&& v) : fValue(v.move()) {}
 
 private:
     const SkPDFUnion fValue;
     typedef SkPDFObject INHERITED;
 };
+#endif  // 0
 
-/** The following six classes exist only to ease transition to SkPDFUnion. */
-class SkPDFObjRef : public SkPDFAtom {
+class SkPDFScalar {

[tomhudson, 2015/05/04 18:31:55]

Now that you've gotten rid of the idea of objects of this class or of
SkPDFString (yay!), is there a preexisting namespace that Append() and
FormatString() could belong to (perhaps with longer names)? Or are they
important enough that they justify these two distinct utilities?

[hal.canary, 2015/05/04 18:48:44]

I'll move them to SkPDFUtils at a later date.

 public:
-    SK_DECLARE_INST_COUNT(SkPDFObjRef);
-    explicit SkPDFObjRef(SkPDFObject* obj)
-        : INHERITED(SkPDFUnion::ObjRef(SkRef(obj))) {}
-    typedef SkPDFAtom INHERITED;
+    static void Append(SkScalar value, SkWStream* stream);
 };
 
-class SkPDFInt : public SkPDFAtom {
+class SkPDFString {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFInt);
-    explicit SkPDFInt(int32_t value) : INHERITED(SkPDFUnion::Int(value)) {}
-    typedef SkPDFAtom INHERITED;
+    static SkString FormatString(const char* input, size_t len);
+    static const size_t kMaxLen = 65535;
 };
 
-class SkPDFBool : public SkPDFAtom {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFBool);
-    explicit SkPDFBool(bool value) : INHERITED(SkPDFUnion::Bool(value)) {}
-    typedef SkPDFAtom INHERITED;
-};
-
-class SkPDFScalar : public SkPDFAtom {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFScalar);
-    explicit SkPDFScalar(SkScalar value)
-        : INHERITED(SkPDFUnion::Scalar(value)) {}
-    static void Append(SkScalar value, SkWStream* stream);
-    typedef SkPDFAtom INHERITED;
-};
-
-class SkPDFString : public SkPDFAtom {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFString);
-    explicit SkPDFString(const char value[])
-        : INHERITED(SkPDFUnion::String(value)) {}
-    explicit SkPDFString(const SkString& value)
-        : INHERITED(SkPDFUnion::String(value)) {}
-
-    static SkString FormatString(const char* input, size_t len);
-
-    static const size_t kMaxLen = 65535;
-
-private:
-    typedef SkPDFAtom INHERITED;
-};
-
-class SkPDFName : public SkPDFAtom {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFName);
-    /** Create a PDF name object. Maximum length is 127 bytes. */
-    explicit SkPDFName(const char name[])
-        : INHERITED(SkPDFUnion::Name(SkString(name))) {}
-    explicit SkPDFName(const SkString& name)
-        : INHERITED(SkPDFUnion::Name(name)) {}
-
-    static const size_t kMaxLen = 127;
-
-private:
-    typedef SkPDFAtom INHERITED;
-};
 
 /** \class SkPDFArray
 
     An array object in a PDF.
 */
 class SkPDFArray : public SkPDFObject {
 public:
     SK_DECLARE_INST_COUNT(SkPDFArray)
 
     static const int kMaxLen = 8191;
@@ skipping 12 matching lines @@
 
     /** The size of the array.
      */
     int size() const;
 
     /** Preallocate space for the given number of entries.
      *  @param length The number of array slots to preallocate.
      */
     void reserve(int length);
 
-    /** Append the object to the end of the array and increments its ref count.
-     *  @param value The value to add to the array.
-     *  @return The value argument is returned.
-     */
-    // DEPRECATED
-    SkPDFObject* append(SkPDFObject* value);
-
     /** Appends a value to the end of the array.
      *  @param value The value to add to the array.
      */
     void appendInt(int32_t);
     void appendBool(bool);
     void appendScalar(SkScalar);
     void appendName(const char[]);
     void appendName(const SkString&);
     void appendString(const char[]);
     void appendString(const SkString&);
@@ skipping 30 matching lines @@
     void emitObject(SkWStream* stream,
                     const SkPDFObjNumMap& objNumMap,
                     const SkPDFSubstituteMap& substitutes) override;
     void addResources(SkPDFObjNumMap*,
                       const SkPDFSubstituteMap&) const override;
 
     /** The size of the dictionary.
      */
     int size() const;
 
-    /** Add the value to the dictionary with the given key.  Refs value.
-     *  @param key   The key for this dictionary entry.
-     *  @param value The value for this dictionary entry.
-     *  @return The value argument is returned.
-     */
-    // DEPRECATED
-    SkPDFObject* insert(SkPDFName* key, SkPDFObject* value);
-    // DEPRECATED
-    SkPDFObject* insert(const char key[], SkPDFObject* value);
-
     /** Add the value to the dictionary with the given key.  Takes
      *  ownership of the object.
      *  @param key   The text of the key for this dictionary entry.
      *  @param value The value for this dictionary entry.
      */
     void insertObject(const char key[], SkPDFObject* value);
     void insertObject(const SkString& key, SkPDFObject* value);
     void insertObjRef(const char key[], SkPDFObject* value);
     void insertObjRef(const SkString& key, SkPDFObject* value);
 
@@ skipping 15 matching lines @@
     void clear();
 
 private:
     struct Record {
         SkPDFUnion fKey;
         SkPDFUnion fValue;
     };
     SkTDArray<Record> fRecords;
     static const int kMaxLen = 4095;
 
-    void set(const SkPDFUnion& name, const SkPDFUnion& value);
     void set(SkPDFUnion&& name, SkPDFUnion&& value);
 
     typedef SkPDFObject INHERITED;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /** \class SkPDFObjNumMap
 
     The PDF Object Number Map manages object numbers.  It is used to
@@ skipping 41 matching lines @@
 
     SkPDFObject* operator()(SkPDFObject* o) const {
         return this->getSubstitute(o);
     }
 
 private:
     SkTHashMap<SkPDFObject*, SkPDFObject*> fSubstituteMap;
 };
 
 #endif