Clean up CPDF_TextPage.

core/fpdftext/include/cpdf_textpage.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_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_
 #define CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_
 
 #include <deque>
@@ skipping 81 matching lines @@
                FX_FLOAT& top,
                FX_FLOAT& right,
                FX_FLOAT& bottom) const;
   int CountBoundedSegments(FX_FLOAT left,
                            FX_FLOAT top,
                            FX_FLOAT right,
                            FX_FLOAT bottom,
                            FX_BOOL bContains = FALSE);
 
  private:
+  enum class TextOrientation {
+    Unknown,
+    Horizontal,
+    Vertical,
+  };
+
+  enum class GenerateCharacter {
+    None,
+    Space,
+    LineBreak,
+    Hyphen,
+  };
+
   FX_BOOL IsHyphen(FX_WCHAR curChar);
   bool IsControlChar(const PAGECHAR_INFO& charInfo);
   void ProcessObject();
   void ProcessFormObject(CPDF_FormObject* pFormObj,
                          const CFX_Matrix& formMatrix);
   void ProcessTextObject(PDFTEXT_Obj pObj);
   void ProcessTextObject(CPDF_TextObject* pTextObj,
                          const CFX_Matrix& formMatrix,
                          const CPDF_PageObjectList* pObjList,
                          CPDF_PageObjectList::const_iterator ObjPos);
-  int ProcessInsertObject(const CPDF_TextObject* pObj,
-                          const CFX_Matrix& formMatrix);
+  GenerateCharacter ProcessInsertObject(const CPDF_TextObject* pObj,
+                                        const CFX_Matrix& formMatrix);
   FX_BOOL GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info);
   FX_BOOL IsSameAsPreTextObject(CPDF_TextObject* pTextObj,
                                 const CPDF_PageObjectList* pObjList,
                                 CPDF_PageObjectList::const_iterator ObjPos);
   FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1,
                            CPDF_TextObject* pTextObj2);
   int GetCharWidth(uint32_t charCode, CPDF_Font* pFont) const;
   void CloseTempLine();
   FPDFText_MarkedContent PreMarkedContent(PDFTEXT_Obj pObj);
   void ProcessMarkedContent(PDFTEXT_Obj pObj);
   void CheckMarkedContentObject(int32_t& start, int32_t& nCount) const;
-  void FindPreviousTextObject(void);
+  void FindPreviousTextObject();
   void AddCharInfoByLRDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
   void AddCharInfoByRLDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
-  int32_t GetTextObjectWritingMode(const CPDF_TextObject* pTextObj);
-  int32_t FindTextlineFlowDirection();
+  TextOrientation GetTextObjectWritingMode(
+      const CPDF_TextObject* pTextObj) const;
+  TextOrientation FindTextlineFlowOrientation() const;
+  void AppendGeneratedCharacter(FX_WCHAR unicode, const CFX_Matrix& formMatrix);
 
   void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend);
   FX_BOOL IsRightToLeft(const CPDF_TextObject* pTextObj,
                         const CPDF_Font* pFont,
                         int nItems) const;
 
   const CPDF_Page* const m_pPage;
   std::vector<uint16_t> m_CharIndex;
   std::deque<PAGECHAR_INFO> m_CharList;
   std::deque<PAGECHAR_INFO> m_TempCharList;
   CFX_WideTextBuf m_TextBuf;
   CFX_WideTextBuf m_TempTextBuf;
   const FPDFText_Direction m_parserflag;
   CPDF_TextObject* m_pPreTextObj;
   CFX_Matrix m_perMatrix;
   bool m_bIsParsed;
   CFX_Matrix m_DisplayMatrix;
   CFX_ArrayTemplate<FPDF_SEGMENT> m_Segments;
   std::vector<CFX_FloatRect> m_SelRects;
   CFX_ArrayTemplate<PDFTEXT_Obj> m_LineObj;
-  int32_t m_TextlineDir;
+  TextOrientation m_TextlineDir;
   CFX_FloatRect m_CurlineRect;
 };
 
 #endif  // CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_