Merge to XFA: Endless tidying in pageint.h

core/src/fpdfapi/fpdf_page/pageint.h

 // Copyright 2014 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_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
 
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 
 class CPDF_AllStates;
 class CPDF_ParseOptions;
 
 #define PARSE_STEP_LIMIT 100
 
 class CPDF_StreamParser {
  public:
+  enum SyntaxType { EndOfData, Number, Keyword, Name, Others };
+
   CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize);
   ~CPDF_StreamParser();
 
   CPDF_Stream* ReadInlineStream(CPDF_Document* pDoc,
                                 CPDF_Dictionary* pDict,
                                 CPDF_Object* pCSObj,
                                 FX_BOOL bDecode);
-  typedef enum { EndOfData, Number, Keyword, Name, Others } SyntaxType;
-
   SyntaxType ParseNextElement();
   uint8_t* GetWordBuf() { return m_WordBuffer; }
-  FX_DWORD GetWordSize() { return m_WordSize; }
+  FX_DWORD GetWordSize() const { return m_WordSize; }
   CPDF_Object* GetObject() {
     CPDF_Object* pObj = m_pLastObj;
     m_pLastObj = NULL;
     return pObj;
   }
-  FX_DWORD GetPos() { return m_Pos; }
+  FX_DWORD GetPos() const { return m_Pos; }
   void SetPos(FX_DWORD pos) { m_Pos = pos; }
-
   CPDF_Object* ReadNextObject(FX_BOOL bAllowNestedArray = FALSE,
                               FX_BOOL bInArray = FALSE);
   void SkipPathObject();
 
  protected:
   friend class fpdf_page_parser_old_ReadHexString_Test;
 
   void GetNextWord(FX_BOOL& bIsNumber);
   CFX_ByteString ReadString();
   CFX_ByteString ReadHexString();
   const uint8_t* m_pBuf;
 
   // Length in bytes of m_pBuf.
   FX_DWORD m_Size;
 
   // Current byte position within m_pBuf.
   FX_DWORD m_Pos;
 
   uint8_t m_WordBuffer[256];
   FX_DWORD m_WordSize;
   CPDF_Object* m_pLastObj;
 
  private:
   bool PositionIsInBounds() const;
 };
-typedef enum {
-  PDFOP_CloseFillStrokePath = 0,
-  PDFOP_FillStrokePath,
-  PDFOP_CloseEOFillStrokePath,
-  PDFOP_EOFillStrokePath,
-  PDFOP_BeginMarkedContent_Dictionary,
-  PDFOP_BeginImage,
-  PDFOP_BeginMarkedContent,
-  PDFOP_BeginText,
-  PDFOP_BeginSectionUndefined,
-  PDFOP_CurveTo_123,
-  PDFOP_ConcatMatrix,
-  PDFOP_SetColorSpace_Fill,
-  PDFOP_SetColorSpace_Stroke,
-  PDFOP_SetDash,
-  PDFOP_SetCharWidth,
-  PDFOP_SetCachedDevice,
-  PDFOP_ExecuteXObject,
-  PDFOP_MarkPlace_Dictionary,
-  PDFOP_EndImage,
-  PDFOP_EndMarkedContent,
-  PDFOP_EndText,
-  PDFOP_EndSectionUndefined,
-  PDFOP_FillPath,
-  PDFOP_FillPathOld,
-  PDFOP_EOFillPath,
-  PDFOP_SetGray_Fill,
-  PDFOP_SetGray_Stroke,
-  PDFOP_SetExtendGraphState,
-  PDFOP_ClosePath,
-  PDFOP_SetFlat,
-  PDFOP_BeginImageData,
-  PDFOP_SetLineJoin,
-  PDFOP_SetLineCap,
-  PDFOP_SetCMYKColor_Fill,
-  PDFOP_SetCMYKColor_Stroke,
-  PDFOP_LineTo,
-  PDFOP_MoveTo,
-  PDFOP_SetMiterLimit,
-  PDFOP_MarkPlace,
-  PDFOP_EndPath,
-  PDFOP_SaveGraphState,
-  PDFOP_RestoreGraphState,
-  PDFOP_Rectangle,
-  PDFOP_SetRGBColor_Fill,
-  PDFOP_SetRGBColor_Stroke,
-  PDFOP_SetRenderIntent,
-  PDFOP_CloseStrokePath,
-  PDFOP_StrokePath,
-  PDFOP_SetColor_Fill,
-  PDFOP_SetColor_Stroke,
-  PDFOP_SetColorPS_Fill,
-  PDFOP_SetColorPS_Stroke,
-  PDFOP_ShadeFill,
-  PDFOP_SetCharSpace,
-  PDFOP_MoveTextPoint,
-  PDFOP_MoveTextPoint_SetLeading,
-  PDFOP_SetFont,
-  PDFOP_ShowText,
-  PDFOP_ShowText_Positioning,
-  PDFOP_SetTextLeading,
-  PDFOP_SetTextMatrix,
-  PDFOP_SetTextRenderMode,
-  PDFOP_SetTextRise,
-  PDFOP_SetWordSpace,
-  PDFOP_SetHorzScale,
-  PDFOP_MoveToNextLine,
-  PDFOP_CurveTo_23,
-  PDFOP_SetLineWidth,
-  PDFOP_Clip,
-  PDFOP_EOClip,
-  PDFOP_CurveTo_13,
-  PDFOP_NextLineShowText,
-  PDFOP_NextLineShowText_Space,
-  PDFOP_Invalid
-} PDFOP;
+
 #define PARAM_BUF_SIZE 16
-typedef struct {
+struct ContentParam {
   int m_Type;
   union {
     struct {
       FX_BOOL m_bInteger;
       union {
         int m_Integer;
         FX_FLOAT m_Float;
       };
     } m_Number;
     CPDF_Object* m_pObject;
     struct {
       int m_Len;
       char m_Buffer[32];
     } m_Name;
   };
-} _ContentParam;
+};
 #define _FPDF_MAX_FORM_LEVEL_ 30
 #define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4
 #define _FPDF_MAX_OBJECT_STACK_SIZE_ 512
 class CPDF_StreamContentParser {
  public:
   CPDF_StreamContentParser(CPDF_Document* pDoc,
                            CPDF_Dictionary* pPageResources,
                            CPDF_Dictionary* pParentResources,
                            CFX_Matrix* pmtContentToUser,
                            CPDF_PageObjects* pObjList,
@@ skipping 136 matching lines @@
 
   CPDF_Document* const m_pDocument;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pParentResources;
   CPDF_Dictionary* m_pResources;
   CPDF_PageObjects* m_pObjectList;
   int m_Level;
   CFX_Matrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
   CPDF_ParseOptions m_Options;
-  _ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
+  ContentParam m_ParamBuf1[PARAM_BUF_SIZE];
   FX_DWORD m_ParamStartPos;
   FX_DWORD m_ParamCount;
   CPDF_StreamParser* m_pSyntax;
   std::unique_ptr<CPDF_AllStates> m_pCurStates;
   CPDF_ContentMark m_CurContentMark;
   CFX_ArrayTemplate<CPDF_TextObject*> m_ClipTextList;
   CPDF_TextObject* m_pLastTextObject;
   FX_FLOAT m_DefFontSize;
   int m_CompatCount;
   FX_PATHPOINT* m_pPathPoints;
@@ skipping 17 matching lines @@
   FX_BOOL m_bResourceMissing;
   CFX_ArrayTemplate<CPDF_AllStates*> m_StateStack;
 };
 class CPDF_ContentParser {
  public:
   enum ParseStatus { Ready, ToBeContinued, Done };
 
   CPDF_ContentParser();
   ~CPDF_ContentParser();
 
-  ParseStatus GetStatus() { return m_Status; }
+  ParseStatus GetStatus() const { return m_Status; }
   void Start(CPDF_Page* pPage, CPDF_ParseOptions* pOptions);
   void Start(CPDF_Form* pForm,
              CPDF_AllStates* pGraphicStates,
              CFX_Matrix* pParentMatrix,
              CPDF_Type3Char* pType3Char,
              CPDF_ParseOptions* pOptions,
              int level);
   void Continue(IFX_Pause* pPause);
 
  protected:
@@ skipping 152 matching lines @@
                  FX_FLOAT& G,
                  FX_FLOAT& B) const override;
   CPDF_ColorSpace* GetBaseCS() const override;
 
  private:
   CPDF_ColorSpace* m_pBaseCS;
   CPDF_CountedColorSpace* m_pCountedBaseCS;
 };
 
 #endif  // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_