Use enum class for subtypes of CPDF_Annot.

core/fpdfdoc/include/cpdf_annot.h

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
 #define CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
 
 #include <map>
@@ skipping 18 matching lines @@
 #define ANNOTFLAG_NOZOOM 0x0008
 #define ANNOTFLAG_NOROTATE 0x0010
 #define ANNOTFLAG_NOVIEW 0x0020
 #define ANNOTFLAG_READONLY 0x0040
 #define ANNOTFLAG_LOCKED 0x0080
 #define ANNOTFLAG_TOGGLENOVIEW 0x0100
 
 class CPDF_Annot {
  public:
   enum AppearanceMode { Normal, Rollover, Down };
+  enum class Subtype {
+    UNKNOWN = 0,
+    TEXT,
+    LINK,
+    FREETEXT,
+    LINE,
+    SQUARE,
+    CIRCLE,
+    POLYGON,
+    POLYLINE,
+    HIGHLIGHT,
+    UNDERLINE,
+    SQUIGGLY,
+    STRIKEOUT,
+    STAMP,
+    CARET,
+    INK,
+    POPUP,
+    FILEATTACHMENT,
+    SOUND,
+    MOVIE,
+    WIDGET,
+    SCREEN,
+    PRINTERMARK,
+    TRAPNET,
+    WATERMARK,
+    THREED,
+    RICHMEDIA,
+    XFAWIDGET
+  };
 
   static bool IsAnnotationHidden(CPDF_Dictionary* pAnnotDict);
+  static CPDF_Annot::Subtype StringToAnnotSubtype(
+      const CFX_ByteString& sSubtype);
+  static CFX_ByteString AnnotSubtypeToString(CPDF_Annot::Subtype nSubtype);
 
   CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument);
   ~CPDF_Annot();
 
-  CFX_ByteString GetSubtype() const;
+  CPDF_Annot::Subtype GetSubtype() const;
   uint32_t GetFlags() const;
   CFX_FloatRect GetRect() const;
   const CPDF_Dictionary* GetAnnotDict() const { return m_pAnnotDict; }
   CPDF_Dictionary* GetAnnotDict() { return m_pAnnotDict; }
   FX_BOOL DrawAppearance(CPDF_Page* pPage,
                          CFX_RenderDevice* pDevice,
                          const CFX_Matrix* pUser2Device,
                          AppearanceMode mode,
                          const CPDF_RenderOptions* pOptions);
   FX_BOOL DrawInContext(const CPDF_Page* pPage,
                         CPDF_RenderContext* pContext,
                         const CFX_Matrix* pUser2Device,
                         AppearanceMode mode);
   void ClearCachedAP();
   void DrawBorder(CFX_RenderDevice* pDevice,
                   const CFX_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
   CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
   void SetOpenState(bool bOpenState) { m_bOpenState = bOpenState; }
   CPDF_Annot* GetPopupAnnot() const { return m_pPopupAnnot; }
   void SetPopupAnnot(CPDF_Annot* pAnnot) { m_pPopupAnnot = pAnnot; }
 
  private:
   void GenerateAPIfNeeded();
 
   CPDF_Dictionary* const m_pAnnotDict;
   CPDF_Document* const m_pDocument;
-  const CFX_ByteString m_sSubtype;
+  CPDF_Annot::Subtype m_nSubtype;
   std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
   // |m_bOpenState| is only set for popup annotations.
   bool m_bOpenState;
   // Not owned. If there is a valid pointer in |m_pPopupAnnot|,
   // then this annot is never a popup.
   CPDF_Annot* m_pPopupAnnot;
 };
 
 CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
                                 CPDF_Annot::AppearanceMode mode);
 
 #endif  // CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_