More define cleanup.

core/fpdftext/include/cpdf_textpage.h

Index: core/fpdftext/include/cpdf_textpage.h
diff --git a/core/fpdftext/include/cpdf_textpage.h b/core/fpdftext/include/cpdf_textpage.h
index 1a60a2351d46467ccff6ea147669ef90dd820809..9972a45ebddea33ce790c1358783ce6914900b92 100644
--- a/core/fpdftext/include/cpdf_textpage.h
+++ b/core/fpdftext/include/cpdf_textpage.h
@@ -21,6 +21,10 @@ class CPDF_FormObject;
 class CPDF_Page;
 class CPDF_TextObject;
 
+enum class FPDFText_MarkedContent { Pass = 0, Done, Delay };
+
+enum class FPDFText_Direction { Left = -1, Right = 1 };
+
 struct FPDF_CHAR_INFO {
   FX_WCHAR m_Unicode;
   FX_WCHAR m_Charcode;
@@ -57,7 +61,7 @@ struct PDFTEXT_Obj {
 
 class CPDF_TextPage {
  public:
-  CPDF_TextPage(const CPDF_Page* pPage, int flags);
+  CPDF_TextPage(const CPDF_Page* pPage, FPDFText_Direction flags);
   ~CPDF_TextPage() {}
 
   // IPDF_TextPage:
@@ -91,7 +95,7 @@ class CPDF_TextPage {
                            FX_FLOAT bottom,
                            FX_BOOL bContains = FALSE);
 
-  int GetWordBreak(int index, int direction) const;
+  int GetWordBreak(int index, FPDFText_Direction direction) const;
 
   static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1,
                                  const CFX_FloatRect& rect2);
@@ -120,7 +124,7 @@ class CPDF_TextPage {
   int GetCharWidth(uint32_t charCode, CPDF_Font* pFont) const;
   void CloseTempLine();
   void OnPiece(CFX_BidiChar* pBidi, CFX_WideString& str);
-  int32_t PreMarkedContent(PDFTEXT_Obj pObj);
+  FPDFText_MarkedContent PreMarkedContent(PDFTEXT_Obj pObj);
   void ProcessMarkedContent(PDFTEXT_Obj pObj);
   void CheckMarkedContentObject(int32_t& start, int32_t& nCount) const;
   void FindPreviousTextObject(void);
@@ -140,7 +144,7 @@ class CPDF_TextPage {
   std::deque<PAGECHAR_INFO> m_TempCharList;
   CFX_WideTextBuf m_TextBuf;
   CFX_WideTextBuf m_TempTextBuf;
-  const int m_parserflag;
+  const FPDFText_Direction m_parserflag;
   CPDF_TextObject* m_pPreTextObj;
   CFX_Matrix m_perMatrix;
   bool m_bIsParsed;